wip ~ fix cl warnings

Author: rivy

command.c

@@ -1220,6 +1220,9 @@ public void commands(void)
     IFILE new_ifile;
     char *tagfile;
 
+    c = 0;
+    extra = 0;
+
     search_type = SRCH_FORW;
     wscroll = (sc_height + 1) / 2;
     newaction = A_NOACTION;
@@ -1322,7 +1325,7 @@ public void commands(void)
                  * want erase_char/kill_char to be treated
                  * as line editing characters.
                  */
-                tbuf[0] = c;
+                tbuf[0] = (char)c;
                 tbuf[1] = '\0';
                 cbuf = tbuf;
             }
@@ -2004,7 +2007,7 @@ public void commands(void)
                     c = '.';
                 if (badmark(c))
                     break;
-                pipec = c;
+                pipec = (char)c;
                 start_mca(A_PIPE, "!", ml_shell, 0);
                 c = getcc();
                 goto again;

cvt.c

@@ -19,11 +19,9 @@ extern int utf_mode;
 /*
  * Get the length of a buffer needed to convert a string.
  */
-    public size_t
-cvt_length(len, ops)
-    size_t len;
-    int ops;
+public size_t cvt_length(size_t len, int ops)
 {
+    (void)ops;
     if (utf_mode)
         /*
          * Just copying a string in UTF-8 mode can cause it to grow
@@ -37,9 +35,7 @@ cvt_length(len, ops)
 /*
  * Allocate a chpos array for use by cvt_text.
  */
-    public int *
-cvt_alloc_chpos(len)
-    size_t len;
+public int *cvt_alloc_chpos(size_t len)
 {
     size_t i;
     int *chpos = (int *) ecalloc(sizeof(int), len);

decode.c

@@ -444,6 +444,8 @@ static int mouse_wheel_up(void)
  */
 static int mouse_button_rel(int x, int y)
 {
+    (void)x; // avoid `unreferenced formal parameter` warning
+
     /*
      * {{ It would be better to return an action and then do this
      *    in commands() but it's nontrivial to pass y to it. }}
@@ -465,7 +467,7 @@ static int getcc_int(char *pterm)
     int digits = 0;
     for (;;)
     {
-        char ch = getcc();
+        char ch = (char)getcc();
         if (ch < '0' || ch > '9')
         {
             if (pterm != NULL) *pterm = ch;
@@ -875,6 +877,8 @@ public int add_hometable(int (*call_lesskey)(char *, int), char *envname, char *
     char *filename;
     int r;
 
+    filename = NULL; // avoid `potentially uninitialized local variable` warning
+
     if (envname != NULL && (filename = lgetenv(envname)) != NULL)
         filename = save(filename);
     else if (sysvar) /* def_filename is full path */
@@ -941,7 +945,7 @@ public int editchar(int c, int flags)
     do {
             if (nch > 0)
             c = getcc();
-        usercmd[nch] = c;
+        usercmd[nch] = (char)c;
         usercmd[nch+1] = '\0';
         nch++;
         action = ecmd_decode(usercmd, &s);

edit.c

@@ -218,6 +218,8 @@ static void modeline_options(char *str, char end_char)
  */
 static void check_modeline(char *line)
 {
+    (void)line; // avoid `unused parameter` warning
+
 #if HAVE_STRSTR
     static char *pgms[] = { "less:", "vim:", "vi:", "ex:", NULL };
     char **pgm;
@@ -448,6 +450,8 @@ public int edit_ifile(IFILE ifile)
     IFILE was_curr_ifile;
     PARG parg;
 
+    f = 0; // avoid `potentially uninitialized local variable` warning
+
     if (ifile == curr_ifile)
     {
         /*
@@ -601,9 +605,9 @@ public int edit_ifile(IFILE ifile)
     }
     if (!force_open && f >= 0 && isatty(f))
     {
-        PARG parg;
-        parg.p_string = filename;
-        error("%s is a terminal (use -f to open it)", &parg);
+        PARG arg;
+        arg.p_string = filename;
+        error("%s is a terminal (use -f to open it)", &arg);
         return edit_error(filename, alt_filename, altpipe, ifile, was_curr_ifile);
     }
 

filename.c

@@ -505,7 +505,8 @@ static POSITION seek_filesize(int f)
 static char * readfd(FILE *fd)
 {
     int len;
-    int ch;
+    int c;
+    char ch;
     char *buf;
     char *p;
 
@@ -517,8 +518,9 @@ static char * readfd(FILE *fd)
     buf = (char *) ecalloc(len, sizeof(char));
     for (p = buf;  ;  p++)
     {
-        if ((ch = getc(fd)) == '\n' || ch == EOF)
+        if ((c = getc(fd)) == '\n' || c == EOF)
             break;
+        ch = (char)c;
         if (p - buf >= len-1)
         {
             /*

lesskey_parse.c

@@ -123,6 +123,10 @@ static struct lesskey_cmdname editnames[] =
 static void parse_error(char *fmt, char *arg1)
 {
     char buf[2048];
+
+    (void)fmt; // avoid `unreferenced formal parameter` warning
+    (void)arg1; // avoid `unreferenced formal parameter` warning
+
     ++errors;
     lesskey_parse_error(buf);
 }
@@ -153,7 +157,7 @@ static char * char_string(char *buf, int ch, int lit)
 {
     if (lit || (ch >= 0x20 && ch < 0x7f))
     {
-        buf[0] = ch;
+        buf[0] = (char)ch;
         buf[1] = '\0';
     } else
     {
@@ -294,9 +298,7 @@ static int issp(char ch)
 /*
  * Skip leading spaces in a string.
  */
-    char *
-skipsp(s)
-    char *s;
+char * skipsp(char *s)
 {
     while (issp(*s))
         s++;
@@ -381,6 +383,8 @@ static char * version_line(char *s, struct lesskey_tables *tables)
     char *e;
     char buf[CHAR_STRING_LEN];
 
+    (void)tables; // avoid `unreferenced formal parameter` warning
+
     s += strlen("#version");
     s = skipsp(s);
     op = *s++;

line.c

@@ -789,7 +789,6 @@ static int store_char(LWCHAR ch, int a, char *rep, POSITION pos)
         if (linebuf.end > linebuf.print)
         {
             /* Shift left enough to put last byte of this char at print-1. */
-            int i;
             for (i = 0; i < linebuf.print; i++)
             {
                 linebuf.buf[i] = linebuf.buf[i+replen];
@@ -929,7 +928,7 @@ public int pappend(int c, POSITION pos)
         {
         retry:
             mbc_buf_index = 1;
-            *mbc_buf = c;
+            *mbc_buf = (char)c;
             if (IS_ASCII_OCTET(c))
                 r = do_append(c, NULL, pos);
             else if (IS_UTF8_LEAD(c))
@@ -942,7 +941,7 @@ public int pappend(int c, POSITION pos)
                 r = flush_mbc_buf(pos);
         } else if (IS_UTF8_TRAIL(c))
         {
-            mbc_buf[mbc_buf_index++] = c;
+            mbc_buf[mbc_buf_index++] = (char)c;
             if (mbc_buf_index < mbc_buf_len)
                 return (0);
             if (is_utf8_well_formed(mbc_buf, mbc_buf_index))
@@ -1360,7 +1359,7 @@ public POSITION forw_raw_line(POSITION curr_pos, char **linep, int *line_lenp)
                 break;
             }
         }
-        linebuf.buf[n++] = c;
+        linebuf.buf[n++] = (char)c;
         c = ch_forw_get();
     }
     linebuf.buf[n] = '\0';
@@ -1432,7 +1431,7 @@ public POSITION back_raw_line(POSITION curr_pos, char **linep, int *line_lenp)
                 *to = *fm;
             n = size_linebuf - old_size_linebuf;
         }
-        linebuf.buf[--n] = c;
+        linebuf.buf[--n] = (char)c;
     }
     if (linep != NULL)
         *linep = &linebuf.buf[n];

main.c

@@ -302,8 +302,11 @@ int main(int argc, char *argv[])
     init();
     commands();
     quit(QUIT_OK);
+
+    #ifndef _MSC_VER
     /*NOTREACHED*/
     return (0);
+    #endif
 }
 
 /*

mark.c

@@ -73,7 +73,7 @@ public void init_mark(void)
         switch (i) {
         case MOUSEMARK: letter = '#'; break;
         case LASTMARK: letter = '\''; break;
-        default: letter = (i < 26) ? 'a'+i : 'A'+i-26; break;
+        default: letter = (i < 26) ? 'a'+(char)i : 'A'+(char)i-26; break;
         }
         marks[i].m_letter = letter;
         cmark(&marks[i], NULL_IFILE, NULL_POSITION, -1);
@@ -318,8 +318,8 @@ public char posmark(POSITION pos)
     {
         if (marks[i].m_ifile == curr_ifile && marks[i].m_scrpos.pos == pos)
         {
-            if (i < 26) return 'a' + i;
-            if (i < 26*2) return 'A' + (i - 26);
+            if (i < 26) return 'a' + (char)i;
+            if (i < 26*2) return 'A' + ((char)i - 26);
             return '#';
         }
     }

optfunc.c

@@ -454,6 +454,8 @@ public void opt__P(int type, char *s)
     /*ARGSUSED*/
 public void opt_b(int type, char *s)
 {
+    (void)s; // avoid `unreferenced formal parameter` warning
+
     switch (type)
     {
     case INIT:
@@ -474,6 +476,8 @@ public void opt_b(int type, char *s)
     /*ARGSUSED*/
 public void opt_i(int type, char *s)
 {
+    (void)s; // avoid `unreferenced formal parameter` warning
+
     switch (type)
     {
     case TOGGLE:
@@ -491,6 +495,8 @@ public void opt_i(int type, char *s)
     /*ARGSUSED*/
 public void opt__V(int type, char *s)
 {
+    (void)s; // avoid `unreferenced formal parameter` warning
+
     switch (type)
     {
     case TOGGLE:
@@ -815,6 +821,8 @@ public void opt_rscroll(int type, char *s)
     /*ARGSUSED*/
 public void opt_query(int type, char *s)
 {
+    (void)s; // avoid `unreferenced formal parameter` warning
+
     switch (type)
     {
     case QUERY:
@@ -832,6 +840,8 @@ public void opt_query(int type, char *s)
     /*ARGSUSED*/
 public void opt_mousecap(int type, char *s)
 {
+    (void)s; // avoid `unreferenced formal parameter` warning
+
     switch (type)
     {
     case TOGGLE:
@@ -852,6 +862,8 @@ public void opt_mousecap(int type, char *s)
     /*ARGSUSED*/
 public void opt_wheel_lines(int type, char *s)
 {
+    (void)s; // avoid `unreferenced formal parameter` warning
+
     switch (type)
     {
     case INIT:
@@ -872,6 +884,8 @@ public void opt_linenum_width(int type, char *s)
 {
     PARG parg;
 
+    (void)s; // avoid `unreferenced formal parameter` warning
+
     switch (type)
     {
     case INIT:
@@ -896,6 +910,8 @@ public void opt_status_col_width(int type, char *s)
 {
     PARG parg;
 
+    (void)s; // avoid `unreferenced formal parameter` warning
+
     switch (type)
     {
     case INIT:
@@ -918,6 +934,8 @@ public void opt_status_col_width(int type, char *s)
     /*ARGSUSED*/
 public void opt_filesize(int type, char *s)
 {
+    (void)s; // avoid `unreferenced formal parameter` warning
+
     switch (type)
     {
     case INIT:
@@ -1052,7 +1070,7 @@ public void opt_search_type(int type, char *s)
         if (def_search_type & SRCH_WRAP)       *bp++ = 'W';
         for (i = 1;  i <= NUM_SEARCH_COLORS;  i++)
             if (def_search_type & SRCH_SUBSEARCH(i))
-                *bp++ = '0'+i;
+                *bp++ = '0'+(char)i;
         if (bp == buf)
             *bp++ = '-';
         *bp = '\0';