shithub: sox

Info  •  Files  •  Log  •  Branches

fix warnings/errors on 64-bit arch

--- a/src/getopt.c

+++ b/src/getopt.c

@@ -673,7 +673,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, (unsigned)(nameend - nextchar)))

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

           {

             if ((unsigned int) (nameend - nextchar)

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

@@ -1011,7 +1011,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, (unsigned)(nameend - nextchar)))

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

             {

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

                 {

--- a/src/sox.c

+++ b/src/sox.c

@@ -2361,7 +2361,7 @@

   }

   if (type == Full) {

     if (soxi_file_count > 1 && soxi_total > 0)

-      printf("Total Duration of %u files: %s\n", soxi_file_count, str_time(soxi_total));

+      printf("Total Duration of %u files: %s\n", (unsigned)soxi_file_count, str_time(soxi_total));

   }

   else if (do_total) {

     if (soxi_total < 0)

--- a/src/synth.c

+++ b/src/synth.c

@@ -67,7 +67,7 @@

 #define PINK_MAX_RANDOM_ROWS   (30)

 #define PINK_RANDOM_BITS       (24)

-#define PINK_RANDOM_SHIFT      ((sizeof(long)*8)-PINK_RANDOM_BITS)

+#define PINK_RANDOM_SHIFT      ((sizeof(int32_t)*8)-PINK_RANDOM_BITS)

 typedef struct {

   long pink_Rows[PINK_MAX_RANDOM_ROWS];