Index: drupal/includes/locale.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/locale.inc,v
retrieving revision 1.126
diff -u -p -r1.126 locale.inc
--- drupal/includes/locale.inc	17 May 2007 08:34:43 -0000	1.126
+++ drupal/includes/locale.inc	19 May 2007 17:32:53 -0000
@@ -176,7 +176,7 @@ function locale_languages_edit_form($lan
     return $form;
   }
   else {
-    drupal_not_found();
+    return MENU_NOT_FOUND;
   }
 }
 
@@ -359,7 +359,7 @@ function locale_languages_delete_form($l
   $languages = language_list();
 
   if (!isset($languages[$langcode])) {
-    drupal_not_found();
+    return MENU_NOT_FOUND;
   }
   else {
     $form['langcode'] = array('#type' => 'value', '#value' => $langcode);
Index: drupal/modules/blog/blog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blog/blog.module,v
retrieving revision 1.280
diff -u -p -r1.280 blog.module
--- drupal/modules/blog/blog.module	30 Apr 2007 17:03:23 -0000	1.280
+++ drupal/modules/blog/blog.module	19 May 2007 17:32:54 -0000
@@ -160,7 +160,7 @@ function blog_page_user($uid) {
     return $output;
   }
   else {
-    drupal_not_found();
+    return MENU_NOT_FOUND;
   }
 }
 
Index: drupal/modules/book/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.module,v
retrieving revision 1.420
diff -u -p -r1.420 book.module
--- drupal/modules/book/book.module	14 May 2007 13:43:34 -0000	1.420
+++ drupal/modules/book/book.module	19 May 2007 17:32:56 -0000
@@ -654,7 +654,7 @@ function book_export($type, $nid) {
   }
   else {
     drupal_set_message(t('Unknown export format.'));
-    drupal_not_found();
+    return MENU_NOT_FOUND;
   }
 }
 
@@ -692,7 +692,7 @@ function book_export_html($nid, $depth) 
     return theme('book_export_html', check_plain($node->title), $content);
   }
   else {
-    drupal_access_denied();
+    return MENU_ACCESS_DENIED;
   }
 }
 
@@ -890,7 +890,7 @@ function book_admin_edit($nid) {
     return $form;
   }
   else {
-    drupal_not_found();
+    return MENU_NOT_FOUND;
   }
 }
 
Index: drupal/modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.543
diff -u -p -r1.543 comment.module
--- drupal/modules/comment/comment.module	17 May 2007 20:57:19 -0000	1.543
+++ drupal/modules/comment/comment.module	19 May 2007 17:33:01 -0000
@@ -631,7 +631,7 @@ function comment_edit($cid) {
     return comment_form_box((array)$comment);
   }
   else {
-    drupal_access_denied();
+    return MENU_ACCESS_DENIED;
   }
 }
 
Index: drupal/modules/filter/filter.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v
retrieving revision 1.173
diff -u -p -r1.173 filter.module
--- drupal/modules/filter/filter.module	14 May 2007 13:43:35 -0000	1.173
+++ drupal/modules/filter/filter.module	19 May 2007 17:33:05 -0000
@@ -345,7 +345,7 @@ function filter_admin_delete() {
     }
   }
   else {
-    drupal_not_found();
+    return MENU_NOT_FOUND;
   }
 }
 
Index: drupal/modules/menu/menu.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v
retrieving revision 1.111
diff -u -p -r1.111 menu.module
--- drupal/modules/menu/menu.module	16 May 2007 13:45:16 -0000	1.111
+++ drupal/modules/menu/menu.module	19 May 2007 17:33:07 -0000
@@ -220,8 +220,7 @@ function menu_flip_item($visible, $mid, 
 function menu_edit_item_form($type, $mid = 0) {
   if ($type == 'edit') {
     if (!($item = menu_get_item_by_mid($mid))) {
-      drupal_not_found();
-      return;
+      return MENU_NOT_FOUND;
     }
   }
   else {
@@ -415,8 +414,7 @@ function menu_node_form_delete($node) {
 function menu_edit_menu_form($type, $mid = 0) {
   if ($type == 'edit') {
     if (!$item = menu_get_item_by_mid($mid)) {
-      drupal_not_found();
-      return;
+      return MENU_NOT_FOUND;
     }
   }
   else {
@@ -447,8 +445,7 @@ function menu_edit_menu_form($type, $mid
  */
 function menu_item_delete_form($mid) {
   if (!($menu = db_fetch_object(db_query('SELECT type, path, title FROM {menu} WHERE mid = %d', $mid)))) {
-    drupal_not_found();
-    return;
+    return MENU_NOT_FOUND;
   }
 
   $form['path'] = array('#type' => 'value', '#value' => $menu->path);
@@ -494,7 +491,7 @@ function menu_reset_item($mid) {
     return confirm_form($form, t('Are you sure you want to reset the item %item to its default values?', array('%item' => $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: drupal/modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.815
diff -u -p -r1.815 node.module
--- drupal/modules/node/node.module	19 May 2007 13:31:51 -0000	1.815
+++ drupal/modules/node/node.module	19 May 2007 17:33:14 -0000
@@ -1768,7 +1768,7 @@ function node_revision_revert($nid, $rev
     }
     drupal_goto('node/'. $nid .'/revisions');
   }
-  drupal_access_denied();
+  return MENU_ACCESS_DENIED;
 }
 
 /**
@@ -1801,7 +1801,7 @@ function node_revision_delete($nid, $rev
     }
   }
 
-  drupal_access_denied();
+  return MENU_ACCESS_DENIED;
 }
 
 /**
@@ -2401,8 +2401,7 @@ function node_revisions() {
         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));
@@ -2411,8 +2410,7 @@ function node_revisions() {
               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;
@@ -2424,7 +2422,7 @@ function node_revisions() {
         break;
     }
   }
-  drupal_not_found();
+  return MENU_NOT_FOUND;
 }
 
 /**
Index: drupal/modules/poll/poll.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v
retrieving revision 1.228
diff -u -p -r1.228 poll.module
--- drupal/modules/poll/poll.module	14 May 2007 13:43:36 -0000	1.228
+++ drupal/modules/poll/poll.module	19 May 2007 17:33:16 -0000
@@ -484,7 +484,7 @@ function poll_results() {
     return node_show($node, 0);
   }
   else {
-    drupal_not_found();
+    return MENU_NOT_FOUND;
   }
 }
 
@@ -511,7 +511,7 @@ function poll_votes() {
     print theme('page', $output);
   }
   else {
-    drupal_not_found();
+    return MENU_NOT_FOUND;
   }
 }
 
@@ -555,7 +555,7 @@ function poll_vote(&$node) {
     drupal_goto('node/'. $nid);
   }
   else {
-    drupal_not_found();
+    return MENU_NOT_FOUND;
   }
 }
 
@@ -588,7 +588,7 @@ function poll_cancel(&$node) {
     drupal_goto('node/'. $nid);
   }
   else {
-    drupal_not_found();
+    return MENU_NOT_FOUND;
   }
 }
 
Index: drupal/modules/profile/profile.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.module,v
retrieving revision 1.201
diff -u -p -r1.201 profile.module
--- drupal/modules/profile/profile.module	14 May 2007 13:43:36 -0000	1.201
+++ drupal/modules/profile/profile.module	19 May 2007 17:33:18 -0000
@@ -215,8 +215,7 @@ function profile_field_form($arg = NULL)
       $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',
@@ -225,15 +224,13 @@ function profile_field_form($arg = NULL)
       $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])));
@@ -392,8 +389,7 @@ function profile_field_form_submit($form
 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);
@@ -459,13 +455,11 @@ function profile_browse() {
   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.
@@ -491,8 +485,7 @@ function profile_browse() {
         $arguments[] = $value;
         break;
       default:
-        drupal_not_found();
-        return;
+        return MENU_NOT_FOUND;
     }
 
     // Extract the affected users:
@@ -518,7 +511,7 @@ function profile_browse() {
     return $output;
   }
   else if ($name && !$field->fid) {
-    drupal_not_found();
+    return MENU_NOT_FOUND;
   }
   else {
     // Compile a list of fields to show.
Index: drupal/modules/statistics/statistics.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.module,v
retrieving revision 1.258
diff -u -p -r1.258 statistics.module
--- drupal/modules/statistics/statistics.module	30 Apr 2007 17:03:27 -0000	1.258
+++ drupal/modules/statistics/statistics.module	19 May 2007 17:33:20 -0000
@@ -186,7 +186,7 @@ function statistics_access_log($aid) {
     return $output;
   }
   else {
-    drupal_not_found();
+    return MENU_NOT_FOUND;
   }
 }
 
@@ -219,7 +219,7 @@ function statistics_node_tracker() {
     return $output;
   }
   else {
-    drupal_not_found();
+    return MENU_NOT_FOUND;
   }
 }
 
@@ -250,7 +250,7 @@ function statistics_user_tracker() {
     return $output;
   }
   else {
-    drupal_not_found();
+    return MENU_NOT_FOUND;
   }
 }
 
Index: drupal/modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.478
diff -u -p -r1.478 system.module
--- drupal/modules/system/system.module	17 May 2007 07:28:42 -0000	1.478
+++ drupal/modules/system/system.module	19 May 2007 17:33:27 -0000
@@ -392,7 +392,7 @@ function system_main_admin_page($arg = N
   // 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.
@@ -2640,7 +2640,7 @@ function system_batch_page() {
   require_once './includes/batch.inc';
   $output = _batch_page();
   if ($output === FALSE) {
-    drupal_access_denied();
+    return MENU_ACCESS_DENIED;
   }
   else {
     // Force a page without blocks or messages to
Index: drupal/modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.355
diff -u -p -r1.355 taxonomy.module
--- drupal/modules/taxonomy/taxonomy.module	14 May 2007 13:43:37 -0000	1.355
+++ drupal/modules/taxonomy/taxonomy.module	19 May 2007 17:33:31 -0000
@@ -1382,7 +1382,7 @@ function taxonomy_terms_parse_string($st
 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']) {
@@ -1425,11 +1425,11 @@ function taxonomy_term_page($str_tids = 
           node_feed($result, $channel);
           break;
         default:
-          drupal_not_found();
+          return MENU_NOT_FOUND;
       }
     }
     else {
-      drupal_not_found();
+      return MENU_NOT_FOUND;
     }
   }
 }
@@ -1454,7 +1454,7 @@ function taxonomy_admin_term_edit($tid) 
   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: drupal/modules/tracker/tracker.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/tracker/tracker.module,v
retrieving revision 1.148
diff -u -p -r1.148 tracker.module
--- drupal/modules/tracker/tracker.module	16 May 2007 13:45:16 -0000	1.148
+++ drupal/modules/tracker/tracker.module	19 May 2007 17:33:31 -0000
@@ -66,11 +66,11 @@ function tracker_track_user() {
       return tracker_page($account->uid);
     }
     else {
-      drupal_access_denied();
+      return MENU_ACCESS_DENIED;
     }
   }
   else {
-    drupal_not_found();
+    return MENU_NOT_FOUND;
   }
 }
 
Index: drupal/modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.782
diff -u -p -r1.782 user.module
--- drupal/modules/user/user.module	17 May 2007 21:33:59 -0000	1.782
+++ drupal/modules/user/user.module	19 May 2007 17:33:39 -0000
@@ -1268,7 +1268,7 @@ function user_pass_reset($uid, $timestam
     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;
     }
   }
 }