Index: bakery.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/bakery/bakery.module,v
retrieving revision 1.52.2.9
diff -u -p -r1.52.2.9 bakery.module
--- bakery.module	19 Oct 2010 21:42:30 -0000	1.52.2.9
+++ bakery.module	20 Oct 2010 15:23:36 -0000
@@ -97,10 +97,10 @@ function bakery_user($op, &$array, &$acc
     }
   }
   else if ($op == 'logout') {
-    // eat SSO cookie
-    _bakery_eat_cookie();
-    // eat session cookie
-    _bakery_eat_cookie(session_name());
+    // Destroy SSO cookie.
+    _bakery_toss_cookie();
+    // Destroy session cookie.
+    _bakery_toss_cookie(session_name());
   }
   else if ($op == 'update' && variable_get('bakery_is_master', 0)) {
     // We store email/name if they changed. We want to wait with doing
@@ -510,7 +510,7 @@ function bakery_register() {
     }
 
     // Destroy the redirect cookie.
-    _bakery_eat_cookie('OATMEAL');
+    _bakery_toss_cookie('OATMEAL');
     // Include a hashed value so the slave can validate the request.
     $key = variable_get('bakery_key', '');
     $get_arguments['hash'] = hash_hmac('sha256', $cookie['slave'], $key);
@@ -588,7 +588,7 @@ function bakery_login() {
           $user = $account;
           $edit = array('name' => $user->name);
           bakery_user_authenticate_finalize($edit);
-          _bakery_eat_cookie('OATMEAL');
+          _bakery_toss_cookie('OATMEAL');
           // Redirect back to slave.
           drupal_goto($cookie['slave']);
         }
@@ -600,7 +600,7 @@ function bakery_login() {
     // Report failed login.
     watchdog('user', 'Login attempt failed for %user.', array('%user' => $name));
     // Remove the redirect cookie.
-    _bakery_eat_cookie('OATMEAL');
+    _bakery_toss_cookie('OATMEAL');
     // Clear the messages on the master's session, since they were set during
     // drupal_execute() and will be displayed out of context.
     drupal_get_messages();
@@ -754,9 +754,9 @@ function _bakery_taste_chocolatechip_coo
     return TRUE;
   }
 
-  // Eat the bad cookie. Burp.
+  // Destroy the bad cookie.
   if ($cookie === FALSE) {
-    _bakery_eat_cookie();
+    _bakery_toss_cookie();
   }
 
   // No cookie or invalid cookie
@@ -878,9 +878,9 @@ function bakery_eat_stroopwafel_cookie()
 }
 
 /**
- * Destroy unwanted cookies
+ * Destroy unwanted cookies.
  */
-function _bakery_eat_cookie($type = 'CHOCOLATECHIP') {
+function _bakery_toss_cookie($type = 'CHOCOLATECHIP') {
   setcookie($type, '', $_SERVER['REQUEST_TIME'] - 3600, '/');
   setcookie($type, '', $_SERVER['REQUEST_TIME'] - 3600, '/', variable_get('bakery_domain', ''));
 }