shithub: sox

Info  •  Files  •  Log  •  Branches

warning fix

--- a/src/getopt.c

+++ b/src/getopt.c

@@ -219,13 +219,11 @@

    whose names are inconsistent.  */

 #ifndef getenv

-extern char *getenv ();

+extern char *getenv (char const *);

 #endif

 static char *

-my_index (str, chr)

-     const char *str;

-     int chr;

+my_index (char const * str, int chr)

 {

   while (*str)

     {

@@ -451,6 +449,8 @@

     }

   else

     nonoption_flags_len = 0;

+#else

+  (void)argc, (void)argv;

 #endif

   return optstring;

@@ -660,7 +660,7 @@

       /* Test all long options for either exact match

          or abbreviated matches.  */

       for (p = longopts, option_index = 0; p->name; p++, option_index++)

-        if (!strncmp (p->name, nextchar, nameend - nextchar))

+        if (!strncmp (p->name, nextchar, (unsigned)(nameend - nextchar)))

           {

             if ((unsigned int) (nameend - nextchar)

                 == (unsigned int) strlen (p->name))

@@ -998,7 +998,7 @@

         /* Test all long options for either exact match

            or abbreviated matches.  */

         for (p = longopts, option_index = 0; p->name; p++, option_index++)

-          if (!strncmp (p->name, nextchar, nameend - nextchar))

+          if (!strncmp (p->name, nextchar, (unsigned)(nameend - nextchar)))

             {

               if ((unsigned int) (nameend - nextchar) == strlen (p->name))

                 {