Ticket #3474: mc-3474-cleanup-shorten_64_to_32-warning.patch

lib/tty/key.c

@@ -1284 +1284 @@
 /* --------------------------------------------------------------------------------------------- */
 
 static gboolean
-lookup_keycode (const long code, int *idx)
+lookup_keycode (const int code, int *idx)
 {
     if (code != 0)
     {

lib/widget/input.c

@@ -135 +135 @@
 /* --------------------------------------------------------------------------------------------- */
 
 static gboolean
-input_eval_marks (WInput * in, long *start_mark, long *end_mark)
+input_eval_marks (WInput * in, int *start_mark, int *end_mark)
 {
     if (in->mark >= 0)
     {
@@ -294 +294 @@
 static cb_ret_t
 insert_char (WInput * in, int c_code)
 {
-    int res;
-    long m1, m2;
+    int res, m1, m2;
 
     if (input_eval_marks (in, &m1, &m2))
         delete_region (in, m1, m2);
@@ -737 +736 @@
         break;
     case CK_BackSpace:
         {
-            long m1, m2;
+            int m1, m2;
 
             if (input_eval_marks (in, &m1, &m2))
                 delete_region (in, m1, m2);
@@ -750 +749 @@
             port_region_marked_for_delete (in);
         else
         {
-            long m1, m2;
+            int m1, m2;
 
             if (input_eval_marks (in, &m1, &m2))
                 delete_region (in, m1, m2);
@@ -781 +780 @@
         break;
     case CK_Cut:
         {
-            long m;
+            int m;
 
             m = max (in->mark, 0);
             copy_region (in, m, in->point);
@@ -1300 +1299 @@
                                                   w->cols - has_history));
         else
         {
-            long m1, m2;
+            int m1, m2;
 
             if (input_eval_marks (in, &m1, &m2))
             {

lib/vfs/utilvfs.c

@@ -178 +178 @@
 {
     const char *p;
     char *suffix, *q;
-    int shift;
+    size_t shift;
     int fd;
 
     /* Strip directories */

lib/vfs/path.c

@@ -1089 +1089 @@
 vfs_path_serialize (const vfs_path_t * vpath, GError ** mcerror)
 {
     mc_config_t *cpath;
-    ssize_t element_index;
+    int element_index;
     char *ret_value;
 
     mc_return_val_if_error (mcerror, FALSE);
@@ -1108 +1108 @@
         char *groupname;
         const vfs_path_element_t *element;
 
-        groupname = g_strdup_printf ("path-element-%zd", element_index);
+        groupname = g_strdup_printf ("path-element-%d", element_index);
         element = vfs_path_get_by_index (vpath, element_index);
         /* convert one element to config group */
 

lib/widget/input_complete.c

@@ -99 +99 @@
 
 static int query_height, query_width;
 static WInput *input;
-static int min_end;
-static int start = 0;
-static int end = 0;
+static long min_end;
+static long start = 0;
+static long end = 0;
 
 /*** file scope functions ************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 
-char **try_complete (char *text, int *lc_start, int *lc_end, input_complete_t flags);
+char **try_complete (char *text, long *lc_start, long *lc_end, input_complete_t flags);
 void complete_engine_fill_completions (WInput * in);
 
 #ifdef DO_COMPLETION_DEBUG
@@ -449 +449 @@
 
                 if (hosts_p - hosts >= hosts_alloclen)
                 {
-                    int j;
+                    long j;
 
                     j = hosts_p - hosts;
                     hosts_alloclen += 30;
@@ -701 +701 @@
 completion_matches (const char *text, CompletionFunction entry_function, input_complete_t flags)
 {
     /* Number of slots in match_list. */
-    size_t match_list_size = 30;
+    int match_list_size = 30;
     /* The list of matches. */
     char **match_list;
     /* Number of matches actually found. */
-    size_t matches = 0;
+    int matches = 0;
 
     /* Temporary string binder. */
     char *string;
@@ -737 +737 @@
         }
         else
         {
-            size_t i = 1;
-            int low = 4096;     /* Count of max-matched characters. */
-            size_t j;
+            int i = 1;
+            long low = 4096;     /* Count of max-matched characters. */
+            int j;
 
             qsort (match_list + 1, matches, sizeof (char *), match_compare);
 
@@ -797 +797 @@
 /* --------------------------------------------------------------------------------------------- */
 /** Check if directory completion is needed */
 static gboolean
-check_is_cd (const char *text, int lc_start, input_complete_t flags)
+check_is_cd (const char *text, long lc_start, input_complete_t flags)
 {
     char *p, *q;
 
@@ -819 +819 @@
 /* --------------------------------------------------------------------------------------------- */
 
 static void
-try_complete_commands_prepare (try_complete_automation_state_t * state, char *text, int *lc_start)
+try_complete_commands_prepare (try_complete_automation_state_t * state, char *text, long *lc_start)
 {
     const char *command_separator_chars = ";|&{(`";
     char *ti;
@@ -893 +893 @@
 /* --------------------------------------------------------------------------------------------- */
 
 static char **
-try_complete_all_possible (try_complete_automation_state_t * state, char *text, int *lc_start)
+try_complete_all_possible (try_complete_automation_state_t * state, char *text, long *lc_start)
 {
     char **matches = NULL;
 
@@ -1033 +1033 @@
             }
             else
             {
-                int new_end;
+                long new_end;
                 int i;
                 GList *e;
 
@@ -1076 +1076 @@
                 GList *e;
                 int i;
                 int need_redraw = 0;
-                int low = 4096;
+                long low = 4096;
                 char *last_text = NULL;
 
                 buff[bl++] = (char) parm;
@@ -1233 +1233 @@
                     h = LINES - start_y - 1;
                 }
             }
-            x = start - in->term_first_shown - 2 + start_x;
+            x = (int) start - in->term_first_shown - 2 + start_x;
             w = maxlen + 4;
             if (x + w > COLS)
                 x = COLS - w;
@@ -1279 +1279 @@
 
 /** Returns an array of matches, or NULL if none. */
 char **
-try_complete (char *text, int *lc_start, int *lc_end, input_complete_t flags)
+try_complete (char *text, long *lc_start, long *lc_end, input_complete_t flags)
 {
     try_complete_automation_state_t state;
     char **matches = NULL;

lib/lock.c

@@ -178 +178 @@
 static char *
 lock_get_info (const char *lockfname)
 {
-    int cnt;
+    ssize_t cnt;
     static char buf[BUF_SIZE];
 
     cnt = readlink (lockfname, buf, BUF_SIZE - 1);

lib/charsets.c

@@ -246 +246 @@
 int
 get_codepage_index (const char *id)
 {
-    size_t i;
+    guint i;
     if (strcmp (id, OTHER_8BIT) == 0)
         return -1;
     if (codepages == NULL)

src/filemanager/achown.c

@@ -473 +473 @@
     WDialog *h = DIALOG (w);
     int i;
     int f_pos;
-    unsigned int id;
+    unsigned long id;
 
     id = dlg_get_current_widget_id (h);
 

src/filemanager/cmd.c

@@ -243 +243 @@
 #else
             /* Don't have mmap() :( Even more ugly :) */
             char buf1[BUFSIZ], buf2[BUFSIZ];
-            int n1, n2;
+            ssize_t n1, n2;
             rotate_dash (TRUE);
             do
             {
@@ -541 +541 @@
 
 gboolean
 view_file_at_line (const vfs_path_t * filename_vpath, gboolean plain_view, gboolean internal,
-                   long start_line)
+                   int start_line)
 {
     gboolean ret = TRUE;
 
@@ -580 +580 @@
         char view_entry[BUF_TINY];
 
         if (start_line > 0)
-            g_snprintf (view_entry, sizeof (view_entry), "View:%ld", start_line);
+            g_snprintf (view_entry, sizeof (view_entry), "View:%d", start_line);
         else
             strcpy (view_entry, "View");
 
@@ -1250 +1250 @@
     {
         char buffer[MC_MAXPATHLEN];
         char *p = NULL;
-        int i;
+        ssize_t i;
         char *q;
         vfs_path_t *p_vpath;
 
@@ -1336 +1336 @@
 get_random_hint (int force)
 {
     char *data, *result = NULL, *eop;
-    int len;
+    size_t len;
     int start;
-    static int last_sec;
+    static long last_sec;
     static struct timeval tv;
     GIConv conv;
 
@@ -1353 +1353 @@
         return NULL;
 
     /* get a random entry */
-    srand (tv.tv_sec);
+    srand ((int)tv.tv_sec);
     len = strlen (data);
     start = rand () % (len - 1);
 

src/filemanager/cmd.h

@@ -44 +44 @@
 void single_dirsize_cmd (void);
 void dirsizes_cmd (void);
 gboolean view_file_at_line (const vfs_path_t * filename_vpath, gboolean plain_view,
-                            gboolean internal, long start_line);
+                            gboolean internal, int start_line);
 gboolean view_file (const vfs_path_t * filename_vpath, gboolean normal, gboolean internal);
 void view_cmd (void);
 void view_file_cmd (void);

src/filemanager/command.c

@@ -374 +374 @@
 void
 do_cd_command (char *orig_cmd)
 {
-    int len;
+    ssize_t len;
     int operand_pos = CD_OPERAND_OFFSET;
     const char *cmd;
 

src/filemanager/dir.c

@@ -476 +476 @@
     int bd = MY_ISDIR (b);
 
     if (ad == bd || panels_options.mix_all_files)
-        return (a->st.st_ino - b->st.st_ino) * reverse;
+        return (int)(a->st.st_ino - b->st.st_ino) * reverse;
     else
         return bd - ad;
 }

src/filemanager/ext.c

@@ -273 +273 @@
                 parameter_found = TRUE;
             else
             {
-                int i;
+                long i;
                 char *v;
 
                 i = check_format_view (lc_data);
@@ -777 +777 @@
     struct stat mystat;
     int view_at_line_number;
     char *include_target;
-    int include_target_len;
+    size_t include_target_len;
     gboolean have_type = FALSE; /* Flag used by regex_check_type() */
 
     if (filename_vpath == NULL)

src/filemanager/file.c

@@ -890 +889 @@
         remain_bytes = ctx->progress_bytes - tctx->copied_bytes;
 #if 1
         {
-            int total_secs = tv_current.tv_sec - tctx->transfer_start.tv_sec;
+            long total_secs = tv_current.tv_sec - tctx->transfer_start.tv_sec;
 
             if (total_secs < 1)
                 total_secs = 1;
@@ -1484 +1483 @@
     gid_t src_gid = (gid_t) (-1);
 
     int src_desc, dest_desc = -1;
-    int n_read, n_written;
+    ssize_t n_read, n_written;
     mode_t src_mode = 0;        /* The mode of the source file */
     struct stat sb, sb2;
     struct utimbuf utb;
@@ -1788 +1787 @@
     {
         off_t n_read_total = 0;
         struct timeval tv_current, tv_last_update, tv_last_input;
-        int secs, update_secs;
+        long secs, update_secs;
         const char *stalled_msg = "";
 
         tv_last_update = tv_transfer_start;

src/filemanager/filegui.c

@@ -1170 +1170 @@
                   gboolean only_one,
                   const char *format, const void *text, const char *def_text, gboolean * do_bg)
 {
-    size_t fmd_xlen;
+    int fmd_xlen;
     vfs_path_t *vpath;
     int source_easy_patterns = easy_patterns;
     char fmd_buf[BUF_MEDIUM];

src/filemanager/find.c

@@ -966 +966 @@
     {
         int line = 1;
         int pos = 0;
-        int n_read = 0;
+        ssize_t n_read = 0;
         gboolean found = FALSE;
         gsize found_len;
         char result[BUF_MEDIUM];

src/filemanager/treestore.c

@@ -350 +350 @@
     {
         if (vfs_file_is_local (current->name))
         {
-            int i, common;
+            int i;
+            size_t common;
 
             /* Clear-text compression */
             if (current->prev && (common = str_common (current->prev->name, current->name)) > 2)
             {
                 char *encoded = encode (current->name, common);
 
-                i = fprintf (file, "%d:%d %s\n", current->scanned, common, encoded);
+                i = fprintf (file, "%d:%ld %s\n", current->scanned, common, encoded);
                 g_free (encoded);
             }
             else
@@ -392 +393 @@
     tree_entry *current = ts.tree_first;
     tree_entry *old = NULL;
     tree_entry *new;
-    int submask = 0;
+    long submask = 0;
 
     if (ts.tree_last && ts.tree_last->next)
         abort ();

src/vfs/sftpfs/vfs_class.c

@@ -429 +429 @@
 static ssize_t
 sftpfs_cb_read (void *data, char *buffer, size_t count)
 {
-    int rc;
+    ssize_t rc;
     GError *mcerror = NULL;
     vfs_file_handler_t *fh = (vfs_file_handler_t *) data;
 
@@ -457 +457 @@
 static ssize_t
 sftpfs_cb_write (void *data, const char *buf, size_t nbyte)
 {
-    int rc;
+    ssize_t rc;
     GError *mcerror = NULL;
     vfs_file_handler_t *fh = (vfs_file_handler_t *) data;
 

src/viewer/hex.c

@@ -116 +116 @@
     mark_t boldflag_char = MARK_NORMAL;
     struct hexedit_change_node *curr = view->change_list;
 #ifdef HAVE_CHARSET
-    int cont_bytes = 0;         /* number of continuation bytes remanining from current UTF-8 */
+    long cont_bytes = 0;         /* number of continuation bytes remanining from current UTF-8 */
     gboolean cjk_right = FALSE; /* whether the second byte of a CJK is to be processed */
 #endif /* HAVE_CHARSET */
     gboolean utf8_changed = FALSE;      /* whether any of the bytes in the UTF-8 were changed */

src/editor/edit.c

@@ -1683 +1683 @@
                               long *col1, long *col2)
 {
     off_t cursor;
-    int col;
+    long col;
     off_t blocklen = -1, width = 0;
     unsigned char *data;
 
@@ -2357 +2357 @@
         && spm1 != edit->undo_stack_bottom
         && ((sp - 2) & edit->undo_stack_size_mask) != edit->undo_stack_bottom)
     {
-        int d;
+        long d;
         if (edit->undo_stack[spm1] < 0)
         {
             d = edit->undo_stack[(sp - 2) & edit->undo_stack_size_mask];
@@ -2436 +2436 @@
         && spm1 != edit->redo_stack_bottom
         && ((sp - 2) & edit->redo_stack_size_mask) != edit->redo_stack_bottom)
     {
-        int d;
+        long d;
         if (edit->redo_stack[spm1] < 0)
         {
             d = edit->redo_stack[(sp - 2) & edit->redo_stack_size_mask];
@@ -2967 +2967 @@
             fake_half_tabs = HALF_TAB_SIZE * space_width;
             if (fake_half_tabs != 0 && edit->curs_col % fake_half_tabs != 0)
             {
-                int q;
+                long q;
 
                 q = edit->curs_col;
                 edit->curs_col -= (edit->curs_col % fake_half_tabs);

src/editor/etags.c

@@ -188 +188 @@
     char *chekedstr = NULL;
 
     int num = 0;                /* returned value */
-    int pos;
+    size_t pos;
     char *filename = NULL;
 
     if (!match_func || !tagfile)

src/editor/format.c

@@ -298 +298 @@
 /* --------------------------------------------------------------------------------------------- */
 /** find the start of a word */
 
-static inline int
+static inline off_t
 word_start (unsigned char *t, off_t q, off_t size)
 {
     off_t i;

src/editor/syntax.c

@@ -254 +254 @@
                        const char *whole_left, const char *whole_right, long line_start)
 {
     const unsigned char *p, *q;
-    int c, d, j;
+    off_t j;
+    int c, d;
 
     if (*text == '\0')
         return -1;
@@ -446 +447 @@
             while (*(p = xx_strchr (edit, (unsigned char *) p + 1, c)) != '\0')
             {
                 syntax_keyword_t *k;
-                int count;
+                long count;
                 off_t e;
 
                 count = p - r->keyword_first_chars;
@@ -547 +548 @@
         while (*(p = xx_strchr (edit, (unsigned char *) p + 1, c)) != '\0')
         {
             syntax_keyword_t *k;
-            int count;
+            long count;
             off_t e;
 
             count = p - r->keyword_first_chars;
@@ -1260 +1261 @@
     FILE *f, *g = NULL;
     char *args[1024], *l = NULL;
     long line = 0;
-    int result = 0;
+    long result = 0;
     char *lib_file;
     gboolean found = FALSE;
 

src/setup.c

@@ -690 +690 @@
         values = mc_config_get_string_list (cfg, section_name, *profile_keys, NULL);
         if (values != NULL)
         {
-            int action;
-
-            action = keybind_lookup_action (*profile_keys);
+            long action = keybind_lookup_action (*profile_keys);
             if (action > 0)
             {
                 gchar **curr_values;

src/subshell.c

@@ -462 +462 @@
 feed_subshell (int how, int fail_on_error)
 {
     fd_set read_set;            /* For 'select' */
-    int bytes;                  /* For the return value from 'read' */
+    ssize_t bytes;                  /* For the return value from 'read' */
     int i;                      /* Loop counter */
 
     struct timeval wtime;       /* Maximum time we wait for the subshell */

src/background.c

@@ -348 +348 @@
     }
     else if (type == Return_String)
     {
-        int len;
+        size_t len;
         char *resstr = NULL;
 
         /* FIXME: string routines should also use the Foreground/Background

lib/vfs/parse_ls_vga.c

@@ -80 +80 @@
 static int
 is_dos_date (const char *str)
 {
-    int len;
+    size_t len;
 
     if (!str)
         return 0;
@@ -849 +849 @@
 
     if (t)
     {
-        int p2 = strlen (t);
+        size_t p2 = strlen (t);
         if ((--p2 > 0) && (t[p2] == '\r' || t[p2] == '\n'))
             t[p2] = 0;
         if ((--p2 > 0) && (t[p2] == '\r' || t[p2] == '\n'))

lib/strutil/strutil8bit.c

@@ -259 +259 @@
     static char result[BUF_MEDIUM];
     char *actual;
     size_t remain;
-    int ident = 0;
+    size_t ident = 0;
     size_t length;
     size_t pos = 0;
 
@@ -282 +282 @@
             break;
         }
 
-        if ((int) remain <= ident)
+        if (remain <= ident)
             goto finally;
         memset (actual, ' ', ident);
         actual += ident;

lib/strutil/strutilascii.c

@@ -211 +211 @@
     static char result[BUF_MEDIUM];
     char *actual;
     size_t remain;
-    int ident = 0;
+    size_t ident = 0;
     size_t length;
     size_t pos = 0;
 
@@ -235 +235 @@
         }
 
         /* add space before text */
-        if ((int) remain <= ident)
+        if (remain <= ident)
             goto finally;
         memset (actual, ' ', ident);
         actual += ident;

lib/widget/menu.h

@@ -34 +34 @@
     gboolean is_active;         /* If the menubar is in use */
     gboolean is_dropped;        /* If the menubar has dropped */
     GList *menu;                /* The actual menus */
-    size_t selected;            /* Selected menu on the top bar */
+    guint selected;            /* Selected menu on the top bar */
     unsigned long previous_widget;      /* Selected widget ID before activating menu */
 } WMenuBar;
 

src/vfs/tar/tar.c

@@ -235 +235 @@
  *
  * Result is -1 if the field is invalid (all blank, or nonoctal).
  */
-static long
+static int
 tar_from_oct (int digs, char *where)
 {
-    long value;
+    int value;
 
     while (isspace ((unsigned char) *where))
     {                           /* Skip spaces */
@@ -350 +350 @@
 static union record *
 tar_get_next_record (struct vfs_s_super *archive, int tard)
 {
-    int n;
+    ssize_t n;
 
     (void) archive;
 

lib/tty/tty-ncurses.c

@@ -127 +127 @@
     struct mc_tty_lines_struct
     {
         const char *line;
-        int line_code;
+        chtype line_code;
     } const lines_codes[] = {
         {"\342\224\230", ACS_LRCORNER}, /* ┌ */
         {"\342\224\224", ACS_LLCORNER}, /* └ */

lib/keybind.c

@@ -416 +416 @@
 keybind_cmd_bind (GArray * keymap, const char *keybind, unsigned long action)
 {
     char *caption = NULL;
-    long key;
+    int key;
 
     key = lookup_key (keybind, &caption);
     keymap_add (keymap, key, action, caption);

lib/tty/key.c

@@ -1458 +1458 @@
  * Return the code associated with the symbolic name keyname
  */
 
-long
+int
 lookup_key (const char *name, char **label)
 {
     char **lc_keys, **p;
@@ -1567 +1567 @@
     if (use_meta != -1)
         k = ALT (k);
 
-    return (long) k;
+    return k;
 }
 
 /* --------------------------------------------------------------------------------------------- */

lib/tty/key.h

@@ -75 +75 @@
 void init_key_input_fd (void);
 void done_key (void);
 
-long lookup_key (const char *name, char **label);
+int lookup_key (const char *name, char **label);
 char *lookup_key_by_code (const int keycode);
 /* mouse support */
 int tty_get_event (struct Gpm_Event *event, gboolean redo_event, gboolean block);

src/setup.c

@@ -619 +619 @@
     char *section_name;
     gchar **profile_keys, **keys;
     char *valcopy, *value;
-    long key_code;
+    int key_code;
 
     if (terminal == NULL)
         return;

src/vfs/fish/fish.c

@@ -395 +395 @@
                 ERRNOR (ECONNRESET, FALSE);
             if (strncmp (buffer, "### ", 4) == 0)
                 break;
-            SUP->host_flags = atol (buffer);
+            SUP->host_flags = atoi (buffer);
         }
         return TRUE;
     }

src/vfs/undelfs/undelfs.c

@@ -104 +104 @@
 {
     int f_index;                /* file index into delarray */
     char *buf;
-    int error_code;             /*  */
+    errcode_t error_code;             /*  */
     off_t pos;                  /* file position */
     off_t current;              /* used to determine current position in itereate */
     gboolean finished;
@@ -230 +230 @@
 static int
 undelfs_loaddel (void)
 {
-    int retval, count;
+    int count;
+    errcode_t retval;
     ext2_ino_t ino;
     struct ext2_inode inode;
     ext2_inode_scan scan;
@@ -252 +253 @@
     retval = ext2fs_open_inode_scan (fs, 0, &scan);
     if (retval != 0)
     {
-        message (D_ERROR, undelfserr, _("open_inode_scan: %d"), retval);
+        message (D_ERROR, undelfserr, _("open_inode_scan: %ld"), retval);
         goto free_block_buf;
     }
     retval = ext2fs_get_next_inode (scan, &ino, &inode);
     if (retval != 0)
     {
-        message (D_ERROR, undelfserr, _("while starting inode scan %d"), retval);
+        message (D_ERROR, undelfserr, _("while starting inode scan %ld"), retval);
         goto error_out;
     }
     count = 0;
@@ -280 +281 @@
         retval = ext2fs_block_iterate (fs, ino, 0, block_buf, undelfs_lsdel_proc, &lsd);
         if (retval)
         {
-            message (D_ERROR, undelfserr, _("while calling ext2_block_iterate %d"), retval);
+            message (D_ERROR, undelfserr, _("while calling ext2_block_iterate %ld"), retval);
             goto next;
         }
         if (lsd.free_blocks && !lsd.bad_blocks)
@@ -314 +315 @@
         retval = ext2fs_get_next_inode (scan, &ino, &inode);
         if (retval)
         {
-            message (D_ERROR, undelfserr, _("while doing inode scan %d"), retval);
+            message (D_ERROR, undelfserr, _("while doing inode scan %ld"), retval);
             goto error_out;
         }
     }
@@ -453 +454 @@
         g_free (f);
         return 0;
     }
-    inode = atol (f);
+    inode = atoi (f);
 
     /* Search the file into delarray */
     for (i = 0; i < (ext2_ino_t) num_delarray; i++)
@@ -507 +508 @@
 static int
 undelfs_dump_read (ext2_filsys param_fs, blk_t * blocknr, int blockcnt, void *private)
 {
-    int copy_count;
+    size_t copy_count;
     undelfs_file *p = (undelfs_file *) private;
 
     if (blockcnt < 0)
@@ -580 +581 @@
 undelfs_read (void *vfs_info, char *buffer, size_t count)
 {
     undelfs_file *p = vfs_info;
-    int retval;
+    errcode_t retval;
 
     p->dest_buffer = buffer;
     p->current = 0;
@@ -605 +606 @@
 
 /* --------------------------------------------------------------------------------------------- */
 
-static long
+static int
 undelfs_getindex (char *path)
 {
-    ext2_ino_t inode = atol (path);
+    ext2_ino_t inode = atoi (path);
     int i;
 
     for (i = 0; i < num_delarray; i++)

src/filemanager/usermenu.c

@@ -530 +530 @@
         {
             if (*commands == '%')
             {
-                int i = check_format_view (commands + 1);
+                long i = check_format_view (commands + 1);
                 if (i)
                 {
                     commands += i;
@@ -632 +632 @@
  */
 
 /* Returns how many characters we should advance if %view was found */
-int
+long
 check_format_view (const char *p)
 {
     const char *q = p;
@@ -674 +674 @@
 
 /* --------------------------------------------------------------------------------------------- */
 
-int
+long
 check_format_cd (const char *p)
 {
     return (strncmp (p, "cd", 2)) ? 0 : 3;
@@ -685 +685 @@
 /* Returns the number of skipped characters (zero on not found) */
 /* V will be set to the expanded variable name */
 
-int
+long
 check_format_var (const char *p, char **v)
 {
     const char *q = p;

src/filemanager/usermenu.h

@@ -21 +21 @@
 
 gboolean user_menu_cmd (struct WEdit *edit_widget, const char *menu_file, int selected_entry);
 char *expand_format (struct WEdit *edit_widget, char c, gboolean do_quote);
-int check_format_view (const char *);
-int check_format_var (const char *, char **);
-int check_format_cd (const char *);
+long check_format_view (const char *);
+long check_format_var (const char *, char **);
+long check_format_cd (const char *);
 
 /*** inline functions ****************************************************************************/
 

lib/vfs/vfs.c

@@ -111 +111 @@
  */
 
 static estr_t
-_vfs_translate_path (const char *path, int size, GIConv defcnv, GString * buffer)
+_vfs_translate_path (const char *path, long size, GIConv defcnv, GString * buffer)
 {
     estr_t state = ESTR_SUCCESS;
 #ifdef HAVE_CHARSET
@@ -129 +129 @@
         char encoding[16];
         const char *slash;
         GIConv coder = INVALID_CONV;
-        int ms;
+        long ms;
 
         /* first must be translated part before #enc: */
         ms = semi - path;