Ticket #3547: mc-3547-cleanup-conversion-warning-keybind_t.patch

lib/keybind.c

@@ -395 +395 @@
 /* --------------------------------------------------------------------------------------------- */
 
 static void
-keymap_add (GArray * keymap, long key, unsigned long cmd, const char *caption)
+keymap_add (GArray * keymap, long key, int cmd, const char *caption)
 {
     if (key != 0 && cmd != CK_IgnoreKey)
     {
@@ -413 +413 @@
 /* --------------------------------------------------------------------------------------------- */
 
 void
-keybind_cmd_bind (GArray * keymap, const char *keybind, unsigned long action)
+keybind_cmd_bind (GArray * keymap, const char *keybind, int action)
 {
     char *caption = NULL;
     long key;
@@ -425 +425 @@
 
 /* --------------------------------------------------------------------------------------------- */
 
-unsigned long
+int
 keybind_lookup_action (const char *name)
 {
     const name_keymap_t key = { name, 0 };
@@ -442 +442 @@
 /* --------------------------------------------------------------------------------------------- */
 
 const char *
-keybind_lookup_actionname (unsigned long action)
+keybind_lookup_actionname (int action)
 {
     size_t i;
 
@@ -456 +456 @@
 /* --------------------------------------------------------------------------------------------- */
 
 const char *
-keybind_lookup_keymap_shortcut (const global_keymap_t * keymap, unsigned long action)
+keybind_lookup_keymap_shortcut (const global_keymap_t * keymap, int action)
 {
     if (keymap != NULL)
     {
@@ -471 +471 @@
 
 /* --------------------------------------------------------------------------------------------- */
 
-unsigned long
+int
 keybind_lookup_keymap_command (const global_keymap_t * keymap, long key)
 {
     if (keymap != NULL)

lib/keybind.h

@@ -339 +339 @@
 typedef struct name_keymap_t
 {
     const char *name;
-    unsigned long val;
+    int val;
 } name_keymap_t;
 
 typedef struct key_config_t
@@ -354 +354 @@
 typedef struct global_keymap_t
 {
     long key;
-    unsigned long command;
+    int command;
     char caption[KEYMAP_SHORTCUT_LENGTH];
 } global_keymap_t;
 
@@ -362 +362 @@
 
 /*** declarations of public functions ************************************************************/
 
-void keybind_cmd_bind (GArray * keymap, const char *keybind, unsigned long action);
-unsigned long keybind_lookup_action (const char *name);
-const char *keybind_lookup_actionname (unsigned long action);
-const char *keybind_lookup_keymap_shortcut (const global_keymap_t * keymap, unsigned long action);
-unsigned long keybind_lookup_keymap_command (const global_keymap_t * keymap, long key);
+void keybind_cmd_bind (GArray * keymap, const char *keybind, int action);
+int keybind_lookup_action (const char *name);
+const char *keybind_lookup_actionname (int action);
+const char *keybind_lookup_keymap_shortcut (const global_keymap_t * keymap, int action);
+int keybind_lookup_keymap_command (const global_keymap_t * keymap, long key);
 
 /*** inline functions ****************************************************************************/
 

lib/widget/buttonbar.c

@@ -266 +266 @@
 {
     if ((bb != NULL) && (idx >= 1) && (idx <= BUTTONBAR_LABELS_NUM))
     {
-        unsigned long command = CK_IgnoreKey;
+        int command = CK_IgnoreKey;
 
         if (keymap != NULL)
             command = keybind_lookup_keymap_command (keymap, KEY_F (idx));

lib/widget/buttonbar.h

@@ -28 +28 @@
     struct
     {
         char *text;
-        unsigned long command;
+        int command;
         Widget *receiver;
         int end_coord;          /* cumulative width of buttons so far */
     } labels[BUTTONBAR_LABELS_NUM];

lib/widget/dialog.c

@@ -272 +272 @@
 /* --------------------------------------------------------------------------------------------- */
 
 static cb_ret_t
-dlg_execute_cmd (WDialog * h, unsigned long command)
+dlg_execute_cmd (WDialog * h, int command)
 {
     cb_ret_t ret = MSG_HANDLED;
     switch (command)
@@ -341 +341 @@
 static cb_ret_t
 dlg_handle_key (WDialog * h, int d_key)
 {
-    unsigned long command;
+    int command;
 
     command = keybind_lookup_keymap_command (dialog_map, d_key);
 

lib/widget/dialog.h

@@ -64 +64 @@
 
 /* get string representation of shortcut assigned  with command */
 /* as menu is a widget of dialog, ask dialog about shortcut string */
-typedef char *(*dlg_shortcut_str) (unsigned long command);
+typedef char *(*dlg_shortcut_str) (int command);
 
 /* get dialog name to show in dialog list */
 typedef char *(*dlg_title_str) (const WDialog * h, size_t len);

lib/widget/input.c

@@ -679 +679 @@
 /* --------------------------------------------------------------------------------------------- */
 
 static cb_ret_t
-input_execute_cmd (WInput * in, unsigned long command)
+input_execute_cmd (WInput * in, int command)
 {
     cb_ret_t res = MSG_HANDLED;
 
@@ -1133 +1133 @@
 input_handle_char (WInput * in, int key)
 {
     cb_ret_t v;
-    unsigned long command;
+    int command;
 
     if (quote != 0)
     {
@@ -1177 +1177 @@
 int
 input_key_is_in_map (WInput * in, int key)
 {
-    unsigned long command;
+    int command;
 
     (void) in;
 

lib/widget/listbox.c

@@ -256 +256 @@
 /* --------------------------------------------------------------------------------------------- */
 
 static cb_ret_t
-listbox_execute_cmd (WListbox * l, unsigned long command)
+listbox_execute_cmd (WListbox * l, int command)
 {
     cb_ret_t ret = MSG_HANDLED;
     int i;
@@ -325 +325 @@
 static cb_ret_t
 listbox_key (WListbox * l, int key)
 {
-    unsigned long command;
+    int command;
 
     if (l->list == NULL)
         return MSG_NOT_HANDLED;

lib/widget/menu.c

@@ -57 +57 @@
 {
     unsigned char first_letter;
     hotkey_t text;
-    unsigned long command;
+    int command;
     char *shortcut;
 };
 
@@ -774 +774 @@
 /* --------------------------------------------------------------------------------------------- */
 
 menu_entry_t *
-menu_entry_create (const char *name, unsigned long command)
+menu_entry_create (const char *name, int command)
 {
     menu_entry_t *entry;
 

lib/widget/menu.h

@@ -42 +42 @@
 
 /*** declarations of public functions ************************************************************/
 
-menu_entry_t *menu_entry_create (const char *name, unsigned long command);
+menu_entry_t *menu_entry_create (const char *name, int command);
 void menu_entry_free (menu_entry_t * me);
 
 menu_t *create_menu (const char *name, GList * entries, const char *help_node);

src/diffviewer/ydiff.c

@@ -3145 +3145 @@
 /* --------------------------------------------------------------------------------------------- */
 
 static cb_ret_t
-dview_execute_cmd (WDiff * dview, unsigned long command)
+dview_execute_cmd (WDiff * dview, int command)
 {
     cb_ret_t res = MSG_HANDLED;
 
@@ -3311 +3311 @@
 static cb_ret_t
 dview_handle_key (WDiff * dview, int key)
 {
-    unsigned long command;
+    int command;
 
 #ifdef HAVE_CHARSET
     key = convert_from_input_c (key);

src/editor/edit.c

@@ -3185 +3185 @@
  */
 
 void
-edit_execute_key_command (WEdit * edit, unsigned long command, int char_for_insertion)
+edit_execute_key_command (WEdit * edit, int command, int char_for_insertion)
 {
     if (command == CK_MacroStartRecord || command == CK_RepeatStartRecord
         || (macro_index < 0
@@ -3234 +3234 @@
    all of them. It also does not check for the Undo command.
  */
 void
-edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
+edit_execute_cmd (WEdit * edit, int command, int char_for_insertion)
 {
     Widget *w = WIDGET (edit);
 

src/editor/editcmd.c

@@ -3412 +3412 @@
     /* edit is a pointer to the widget */
     if (edit != NULL)
     {
-        unsigned long command = macro_index < 0 ? CK_MacroStartRecord : CK_MacroStopRecord;
+        int command = macro_index < 0 ? CK_MacroStartRecord : CK_MacroStopRecord;
         edit_execute_key_command (edit, command, -1);
     }
 }
@@ -3425 +3425 @@
     /* edit is a pointer to the widget */
     if (edit != NULL)
     {
-        unsigned long command = macro_index < 0 ? CK_RepeatStartRecord : CK_RepeatStopRecord;
+        int command = macro_index < 0 ? CK_RepeatStartRecord : CK_RepeatStopRecord;
         edit_execute_key_command (edit, command, -1);
     }
 }

src/editor/edit-impl.h

@@ -234 +234 @@
 void edit_goto_cmd (WEdit * edit);
 gboolean eval_marks (WEdit * edit, off_t * start_mark, off_t * end_mark);
 void edit_status (WEdit * edit, gboolean active);
-void edit_execute_key_command (WEdit * edit, unsigned long command, int char_for_insertion);
+void edit_execute_key_command (WEdit * edit, int command, int char_for_insertion);
 void edit_update_screen (WEdit * edit);
 void edit_save_size (WEdit * edit);
-gboolean edit_handle_move_resize (WEdit * edit, unsigned long command);
+gboolean edit_handle_move_resize (WEdit * edit, int command);
 void edit_toggle_fullscreen (WEdit * edit);
 void edit_move_to_line (WEdit * e, long line);
 void edit_move_display (WEdit * e, long line);
@@ -286 +286 @@
 void format_paragraph (WEdit * edit, gboolean force);
 
 /* either command or char_for_insertion must be passed as -1 */
-void edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion);
+void edit_execute_cmd (WEdit * edit, int command, int char_for_insertion);
 
 /*** inline functions ****************************************************************************/
 

src/editor/editwidget.c

@@ -225 +225 @@
  */
 
 static void
-edit_window_move (WEdit * edit, unsigned long command)
+edit_window_move (WEdit * edit, int command)
 {
     Widget *w = WIDGET (edit);
     Widget *wh = WIDGET (w->owner);
@@ -265 +265 @@
  */
 
 static void
-edit_window_resize (WEdit * edit, unsigned long command)
+edit_window_resize (WEdit * edit, int command)
 {
     Widget *w = WIDGET (edit);
     Widget *wh = WIDGET (w->owner);
@@ -359 +359 @@
 /* --------------------------------------------------------------------------------------------- */
 
 static char *
-edit_get_shortcut (unsigned long command)
+edit_get_shortcut (int command)
 {
     const char *ext_map;
     const char *shortcut = NULL;
@@ -708 +708 @@
 /* --------------------------------------------------------------------------------------------- */
 
 static cb_ret_t
-edit_dialog_command_execute (WDialog * h, unsigned long command)
+edit_dialog_command_execute (WDialog * h, int command)
 {
     Widget *wh = WIDGET (h);
     gboolean ret = MSG_HANDLED;
@@ -817 +817 @@
 static gboolean
 edit_translate_key (WEdit * edit, long x_key, int *cmd, int *ch)
 {
-    unsigned long command = (unsigned long) CK_InsertChar;
+    int command = CK_InsertChar;
     int char_for_insertion = -1;
 
     /* an ordinary insertable character */
@@ -929 +929 @@
     *cmd = (int) command;       /* FIXME */
     *ch = char_for_insertion;
 
-    return !(command == (unsigned long) CK_InsertChar && char_for_insertion == -1);
+    return !(command == CK_InsertChar && char_for_insertion == -1);
 }
 
 
@@ -1050 +1050 @@
             if (edit_widget_is_editor (we))
             {
                 WEdit *e = (WEdit *) we;
-                unsigned long command;
+                int command;
 
                 if (!e->extmod)
                     command = keybind_lookup_keymap_command (editor_map, parm);
@@ -1379 +1379 @@
  */
 
 gboolean
-edit_handle_move_resize (WEdit * edit, unsigned long command)
+edit_handle_move_resize (WEdit * edit, int command)
 {
     gboolean ret = FALSE;
 

src/filemanager/midnight.c

@@ -407 +407 @@
 /* --------------------------------------------------------------------------------------------- */
 
 static char *
-midnight_get_shortcut (unsigned long command)
+midnight_get_shortcut (int command)
 {
     const char *ext_map;
     const char *shortcut = NULL;
@@ -1095 +1095 @@
 /* --------------------------------------------------------------------------------------------- */
 
 static cb_ret_t
-midnight_execute_cmd (Widget * sender, unsigned long command)
+midnight_execute_cmd (Widget * sender, int command)
 {
     cb_ret_t res = MSG_HANDLED;
 
@@ -1395 +1395 @@
 static cb_ret_t
 midnight_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *data)
 {
-    unsigned long command;
+    int command;
 
     switch (msg)
     {

src/filemanager/panel.c

@@ -3384 +3384 @@
 /* --------------------------------------------------------------------------------------------- */
 
 static cb_ret_t
-panel_execute_cmd (WPanel * panel, unsigned long command)
+panel_execute_cmd (WPanel * panel, int command)
 {
     int res = MSG_HANDLED;
 

src/filemanager/tree.c

@@ -1029 +1029 @@
 /* --------------------------------------------------------------------------------------------- */
 
 static cb_ret_t
-tree_execute_cmd (WTree * tree, unsigned long command)
+tree_execute_cmd (WTree * tree, int command)
 {
     cb_ret_t res = MSG_HANDLED;
 

src/help.c

@@ -858 +858 @@
 /* --------------------------------------------------------------------------------------------- */
 
 static cb_ret_t
-help_execute_cmd (unsigned long command)
+help_execute_cmd (int command)
 {
     cb_ret_t ret = MSG_HANDLED;
 
@@ -927 +927 @@
 static cb_ret_t
 help_handle_key (WDialog * h, int c)
 {
-    unsigned long command;
+    int command;
 
     command = keybind_lookup_keymap_command (help_map, c);
     if ((command == CK_IgnoreKey) || (help_execute_cmd (command) == MSG_NOT_HANDLED))

src/setup.h

@@ -58 +58 @@
 
 typedef struct macro_action_t
 {
-    unsigned long action;
+    int action;
     int ch;
 } macro_action_t;
 

src/viewer/actions_cmd.c

@@ -382 +382 @@
 /* --------------------------------------------------------------------------------------------- */
 
 static cb_ret_t
-mcview_execute_cmd (WView * view, unsigned long command)
+mcview_execute_cmd (WView * view, int command)
 {
     int res = MSG_HANDLED;
 
@@ -546 +546 @@
 static cb_ret_t
 mcview_handle_key (WView * view, int key)
 {
-    unsigned long command;
+    int command;
 
 #ifdef HAVE_CHARSET
     key = convert_from_input_c (key);