* chmod.c (init_chmod): Make static.

* help.c (quit_cmd): Rename to help_quit_cmd().
(show): Rename to help_show().
* main.c (quit_cmd): Make static.  Return void, not int.
(sort_cmd): Make static.

src/ChangeLog

@@ -1,5 +1,11 @@
 2002-11-12  Pavel Roskin  <proski@gnu.org>
 
+	* chmod.c (init_chmod): Make static.
+	* help.c (quit_cmd): Rename to help_quit_cmd().
+	(show): Rename to help_show().
+	* main.c (quit_cmd): Make static.  Return void, not int.
+	(sort_cmd): Make static.
+
 	* dlg.c (send_message_to): Remove, use send_message() instead.
 	(send_message): Make inline, remove Dlg_head argument.  Change
 	all callers.

src/chmod.c

@@ -187,7 +187,7 @@ static int chmod_callback (Dlg_head *h, int Par, int Msg)
     return 0;
 }
 
-Dlg_head *
+static Dlg_head *
 init_chmod (void)
 {
     int i;

src/cmd.h

@@ -72,7 +72,6 @@ int check_for_default(char *default_file, char *file);
 void info_cmd (void);
 void tree_cmd (void);
 void listing_cmd (void);
-void sort_cmd (void);
 void switch_to_listing (int panel_index);
 void quick_cmd_no_menu (void);
 void info_cmd_no_menu (void);

src/help.c

@@ -356,7 +356,7 @@ static void clear_link_areas (void)
     inside_link_area = 0;
 }
 
-static void show (Dlg_head *h, char *paint_start)
+static void help_show (Dlg_head *h, char *paint_start)
 {
     char *p;
     int  col, line, c;
@@ -570,7 +570,7 @@ help_index_cmd (Dlg_head * h)
     help_callback (h, 0, DLG_DRAW);
 }
 
-static void quit_cmd (void *x)
+static void help_quit_cmd (void *x)
 {
     dlg_stop ((Dlg_head *)x);
 }
@@ -731,7 +731,7 @@ static int help_callback (struct Dlg_head *h, int id, int msg)
     switch (msg){
     case DLG_DRAW:
 	common_dialog_repaint (h);
-	show (h, currentpoint);
+	help_show (h, currentpoint);
 	break;
 
     case DLG_KEY:
@@ -822,7 +822,7 @@ interactive_display (char *filename, char *node)
     define_label (whelp, 7, "", 0);
     define_label (whelp, 8, "", 0);
     define_label (whelp, 9, "", 0);
-    define_label_data (whelp, 10, _("Quit"), quit_cmd, whelp);
+    define_label_data (whelp, 10, _("Quit"), help_quit_cmd, whelp);
 
     run_dlg (whelp);
     interactive_display_finish ();

src/main.c

@@ -638,11 +638,10 @@ quit_cmd_internal (int quiet)
     return quit;
 }
 
-int
+static void
 quit_cmd (void)
 {
     quit_cmd_internal (0);
-    return quit;
 }
 
 int
@@ -906,7 +905,7 @@ maybe_cd (int char_code, int move_up_dir)
     return 0;
 }
 
-void
+static void
 sort_cmd (void)
 {
     WPanel *p;
@@ -1025,7 +1024,7 @@ static menu_entry FileMenu[] = {
     {' ', N_("u&Nselect group    M-\\"), 'N', unselect_cmd},
     {' ', N_("reverse selec&Tion M-*"), 'T', reverse_selection_cmd},
     {' ', "", ' ', 0},
-    {' ', N_("e&Xit              F10"), 'X', (callfn) quit_cmd}
+    {' ', N_("e&Xit              F10"), 'X', quit_cmd}
 };
 
 static menu_entry CmdMenu[] = {
@@ -1415,11 +1414,11 @@ init_labels (void)
     define_label (midnight_dlg, 1, _("Help"), help_cmd);
     define_label (midnight_dlg, 2, _("Menu"), user_file_menu_cmd);
     define_label (midnight_dlg, 9, _("PullDn"), menu_cmd);
-    define_label (midnight_dlg, 10, _("Quit"), (voidfn) quit_cmd);
+    define_label (midnight_dlg, 10, _("Quit"), quit_cmd);
 }
 
 static const key_map ctl_x_map[] = {
-    {XCTRL ('c'), (callfn) quit_cmd},
+    {XCTRL ('c'), quit_cmd},
     {'d', compare_dirs_cmd},
 #ifdef USE_VFS
     {'a', reselect_vfs},

src/main.h

@@ -133,7 +133,6 @@ int load_prompt     (int fd, void *unused);
 void save_cwds_stat (void);
 void copy_prog_name (void);
 int quiet_quit_cmd  (void);	/* For cmd.c and command.c */
-int quit_cmd        (void);
 
 void untouch_bar    (void);
 void touch_bar      (void);