Index: modules/blog/blog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blog/blog.module,v
retrieving revision 1.275
diff -u -r1.275 blog.module
--- modules/blog/blog.module	15 Feb 2007 11:40:17 -0000	1.275
+++ modules/blog/blog.module	23 Feb 2007 23:11:13 -0000
@@ -160,7 +160,7 @@
     return $output;
   }
   else {
-    drupal_not_found();
+    return MENU_NOT_FOUND;
   }
 }
 
Index: modules/book/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.module,v
retrieving revision 1.411
diff -u -r1.411 book.module
--- modules/book/book.module	11 Feb 2007 09:30:51 -0000	1.411
+++ modules/book/book.module	23 Feb 2007 23:23:47 -0000
@@ -679,7 +679,7 @@
     return theme('book_export_html', check_plain($node->title), $content);
   }
   else {
-    drupal_access_denied();
+    return MENU_ACCESS_DENIED;
   }
 }
 
@@ -877,7 +877,7 @@
     return $form;
   }
   else {
-    drupal_not_found();
+    return MENU_NOT_FOUND;
   }
 }
 
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.525
diff -u -r1.525 comment.module
--- modules/comment/comment.module	15 Feb 2007 11:40:18 -0000	1.525
+++ modules/comment/comment.module	23 Feb 2007 23:23:59 -0000
@@ -599,7 +599,7 @@
     return comment_form_box((array)$comment);
   }
   else {
-    drupal_access_denied();
+    return MENU_ACCESS_DENIED;
   }
 }
 
Index: modules/filter/filter.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v
retrieving revision 1.163
diff -u -r1.163 filter.module
--- modules/filter/filter.module	11 Feb 2007 09:30:51 -0000	1.163
+++ modules/filter/filter.module	23 Feb 2007 23:12:48 -0000
@@ -353,7 +353,7 @@
     }
   }
   else {
-    drupal_not_found();
+    return MENU_NOT_FOUND;
   }
 }
 
Index: modules/locale/locale.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v
retrieving revision 1.159
diff -u -r1.159 locale.module
--- modules/locale/locale.module	11 Feb 2007 08:44:32 -0000	1.159
+++ modules/locale/locale.module	23 Feb 2007 23:12:44 -0000
@@ -311,7 +311,7 @@
   $languages = locale_supported_languages(FALSE, TRUE);
 
   if (!isset($languages['name'][$langcode])) {
-    drupal_not_found();
+    return MENU_NOT_FOUND;
   }
   else {
     $form['langcode'] = array('#type' => 'value', '#value' => $langcode);
Index: modules/menu/menu.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v
retrieving revision 1.102
diff -u -r1.102 menu.module
--- modules/menu/menu.module	31 Jan 2007 16:38:34 -0000	1.102
+++ modules/menu/menu.module	23 Feb 2007 23:13:53 -0000
@@ -304,8 +304,7 @@
 function menu_edit_menu_form($type, $mid = 0) {
   if ($type == 'edit') {
     if (!($item = db_fetch_array(db_query('SELECT * FROM {menu} WHERE mid = %d', $mid)))) {
-      drupal_not_found();
-      return;
+      return MENU_NOT_FOUND;
     }
   }
   else {
@@ -335,8 +334,7 @@
 function menu_edit_item_form($type, $mid = 0) {
   if ($type == 'edit') {
     if (!($item = db_fetch_array(db_query('SELECT * FROM {menu} WHERE mid = %d', $mid)))) {
-      drupal_not_found();
-      return;
+      return MENU_NOT_FOUND;
     }
   }
   else {
@@ -420,8 +418,7 @@
  */
 function menu_item_delete_form($mid) {
   if (!($menu = db_fetch_object(db_query('SELECT type, title FROM {menu} WHERE mid = %d', $mid)))) {
-    drupal_not_found();
-    return;
+    return MENU_NOT_FOUND;
   }
 
   $form['mid'] = array('#type' => 'value', '#value' => $mid);
@@ -466,7 +463,7 @@
     return confirm_form($form, t('Are you sure you want to reset the item %item to its default values?', array('%item' => $title)), 'admin/build/menu', t('Any customizations will be lost. This action cannot be undone.'), t('Reset'));
   }
   else {
-    drupal_not_found();
+    return MENU_NOT_FOUND;
   }
 }
 
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.783
diff -u -r1.783 node.module
--- modules/node/node.module	15 Feb 2007 11:40:18 -0000	1.783
+++ modules/node/node.module	23 Feb 2007 23:24:42 -0000
@@ -1672,7 +1672,7 @@
     }
     drupal_goto('node/'. $nid .'/revisions');
   }
-  drupal_access_denied();
+  return MENU_ACCESS_DENIED;
 }
 
 /**
@@ -1705,7 +1705,7 @@
     }
   }
 
-  drupal_access_denied();
+  return MENU_ACCESS_DENIED;
 }
 
 /**
@@ -2314,8 +2314,7 @@
         if ((user_access('view revisions') || user_access('administer nodes')) && node_access('view', $node)) {
           return node_revision_overview($node);
         }
-        drupal_access_denied();
-        return;
+        return MENU_ACCESS_DENIED;
       case 'view':
         if (is_numeric(arg(3))) {
           $node = node_load(arg(1), arg(3));
@@ -2324,8 +2323,7 @@
               drupal_set_title(t('Revision of %title from %date', array('%title' => $node->title, '%date' => format_date($node->revision_timestamp))));
               return node_show($node, arg(2));
             }
-            drupal_access_denied();
-            return;
+            return MENU_ACCESS_DENIED;
           }
         }
         break;
@@ -2337,7 +2335,7 @@
         break;
     }
   }
-  drupal_not_found();
+  return MENU_NOT_FOUND;
 }
 
 /**
Index: modules/poll/poll.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v
retrieving revision 1.224
diff -u -r1.224 poll.module
--- modules/poll/poll.module	11 Feb 2007 09:30:51 -0000	1.224
+++ modules/poll/poll.module	23 Feb 2007 23:16:33 -0000
@@ -464,7 +464,7 @@
     return node_show($node, 0);
   }
   else {
-    drupal_not_found();
+    return MENU_NOT_FOUND;
   }
 }
 
@@ -491,7 +491,7 @@
     print theme('page', $output);
   }
   else {
-    drupal_not_found();
+    return MENU_NOT_FOUND;
   }
 }
 
@@ -535,7 +535,7 @@
     drupal_goto('node/'. $nid);
   }
   else {
-    drupal_not_found();
+    return MENU_NOT_FOUND;
   }
 }
 
@@ -568,7 +568,7 @@
     drupal_goto('node/'. $nid);
   }
   else {
-    drupal_not_found();
+    return MENU_NOT_FOUND;
   }
 }
 
Index: modules/profile/profile.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.module,v
retrieving revision 1.194
diff -u -r1.194 profile.module
--- modules/profile/profile.module	11 Feb 2007 09:30:51 -0000	1.194
+++ modules/profile/profile.module	23 Feb 2007 23:25:08 -0000
@@ -200,8 +200,7 @@
       $edit = db_fetch_array(db_query('SELECT * FROM {profile_fields} WHERE fid = %d', $fid));
 
       if (!$edit) {
-        drupal_not_found();
-        return;
+        return MENU_NOT_FOUND;
       }
       drupal_set_title(t('edit %title', array('%title' => $edit['title'])));
       $form['fid'] = array('#type' => 'value',
@@ -210,15 +209,13 @@
       $type = $edit['type'];
     }
     else {
-      drupal_not_found();
-      return;
+      return MENU_NOT_FOUND;
     }
   }
   else {
     $types = _profile_field_types();
     if (!isset($types[$arg])) {
-      drupal_not_found();
-      return;
+      return MENU_NOT_FOUND;
     }
     $type = $arg;
     drupal_set_title(t('add new %type', array('%type' => $types[$type])));
@@ -366,8 +363,7 @@
 function profile_field_delete($fid) {
   $field = db_fetch_object(db_query("SELECT title FROM {profile_fields} WHERE fid = %d", $fid));
   if (!$field) {
-    drupal_not_found();
-    return;
+    return MENU_NOT_FOUND;
   }
   $form['fid'] = array('#type' => 'value', '#value' => $fid);
   $form['title'] = array('#type' => 'value', '#value' => $field->title);
@@ -432,13 +428,11 @@
   if ($name && $field->fid) {
     // Only allow browsing of fields that have a page title set.
     if (empty($field->page)) {
-      drupal_not_found();
-      return;
+      return MENU_NOT_FOUND;
     }
     // Do not allow browsing of private fields by non-admins.
     if (!user_access('administer users') && $field->visibility == PROFILE_PRIVATE) {
-       drupal_access_denied();
-       return;
+      return MENU_ACCESS_DENIED;
     }
 
     // Compile a list of fields to show.
@@ -464,8 +458,7 @@
         $arguments[] = $value;
         break;
       default:
-        drupal_not_found();
-        return;
+        return MENU_NOT_FOUND;
     }
 
     // Extract the affected users:
@@ -491,7 +484,7 @@
     return $output;
   }
   else if ($name && !$field->fid) {
-    drupal_not_found();
+    return MENU_NOT_FOUND;
   }
   else {
     // Compile a list of fields to show.
Index: modules/statistics/statistics.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.module,v
retrieving revision 1.253
diff -u -r1.253 statistics.module
--- modules/statistics/statistics.module	15 Feb 2007 11:40:18 -0000	1.253
+++ modules/statistics/statistics.module	23 Feb 2007 23:18:34 -0000
@@ -186,7 +186,7 @@
     return $output;
   }
   else {
-    drupal_not_found();
+    return MENU_NOT_FOUND;
   }
 }
 
@@ -214,7 +214,7 @@
     return $output;
   }
   else {
-    drupal_not_found();
+    return MENU_NOT_FOUND;
   }
 }
 
@@ -240,7 +240,7 @@
     return $output;
   }
   else {
-    drupal_not_found();
+    return MENU_NOT_FOUND;
   }
 }
 
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.451
diff -u -r1.451 system.module
--- modules/system/system.module	15 Feb 2007 11:40:18 -0000	1.451
+++ modules/system/system.module	23 Feb 2007 23:19:09 -0000
@@ -341,7 +341,7 @@
   // Let's 404 them since the menu system cannot be told we do not
   // accept arguments.
   if (isset($arg) && substr($arg, 0, 3) != 'by-') {
-    return drupal_not_found();
+    return MENU_NOT_FOUND;
   }
 
   // Check for status report errors.
Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.340
diff -u -r1.340 taxonomy.module
--- modules/taxonomy/taxonomy.module	15 Feb 2007 11:40:18 -0000	1.340
+++ modules/taxonomy/taxonomy.module	23 Feb 2007 23:19:45 -0000
@@ -1351,7 +1351,7 @@
 function taxonomy_term_page($str_tids = '', $depth = 0, $op = 'page') {
   $terms = taxonomy_terms_parse_string($str_tids);
   if ($terms['operator'] != 'and' && $terms['operator'] != 'or') {
-    drupal_not_found();
+    return MENU_NOT_FOUND;
   }
 
   if ($terms['tids']) {
@@ -1394,11 +1394,11 @@
           node_feed($result, $channel);
           break;
         default:
-          drupal_not_found();
+          return MENU_NOT_FOUND;
       }
     }
     else {
-      drupal_not_found();
+      return MENU_NOT_FOUND;
     }
   }
 }
@@ -1423,7 +1423,7 @@
   if ($term = (array)taxonomy_get_term($tid)) {
     return drupal_get_form('taxonomy_form_term', $term['vid'], $term);
   }
-  return drupal_not_found();
+  return MENU_NOT_FOUND;
 }
 
 /**
Index: modules/tracker/tracker.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/tracker/tracker.module,v
retrieving revision 1.146
diff -u -r1.146 tracker.module
--- modules/tracker/tracker.module	15 Feb 2007 11:40:18 -0000	1.146
+++ modules/tracker/tracker.module	23 Feb 2007 23:25:27 -0000
@@ -67,11 +67,11 @@
       return tracker_page($account->uid);
     }
     else {
-      drupal_access_denied();
+      return MENU_ACCESS_DENIED;
     }
   }
   else {
-    drupal_not_found();
+    return MENU_NOT_FOUND;
   }
 }
 
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.756
diff -u -r1.756 user.module
--- modules/user/user.module	15 Feb 2007 11:40:18 -0000	1.756
+++ modules/user/user.module	23 Feb 2007 23:25:46 -0000
@@ -1227,7 +1227,7 @@
     else {
       // Deny access, no more clues.
       // Everything will be in the watchdog's URL for the administrator to check.
-      drupal_access_denied();
+      return MENU_ACCESS_DENIED;
     }
   }
 }