shithub: sox

Info  •  Files  •  Log  •  Branches

Fix various small errors.

--- a/src/Makefile.am

+++ b/src/Makefile.am

@@ -30,7 +30,7 @@

 AM_LDFLAGS = @SAMPLERATE_LIBS@

 sox_SOURCES = sox.c

-sox_LDADD = libst.a libgsm/libgsm.la $(LUA_LIBS)

+sox_LDADD = libst.la libgsm/libgsm.la $(LUA_LIBS)

 all: sox soxmix play rec

--- a/src/stio.c

+++ b/src/stio.c

@@ -223,7 +223,7 @@

         }

         else {

           struct stat st;

-          if (!stat(ft->filename, &st) && !(overwrite_permitted(ft->filename)) {

+          if (!stat(ft->filename, &st) && !overwrite_permitted(ft->filename)) {

             st_fail("Permission to overwrite '%s' denied", ft->filename);

             goto output_error;

           }

--- a/src/xmalloc.c

+++ b/src/xmalloc.c

@@ -62,9 +62,9 @@

 /*

  * Perform a strdup; abort if not possible.

  */

-void *xstrdup(const char *s)

+char *xstrdup(const char *s)

 {

-  void *t = strdup(s);

+  char *t = strdup(s);

   if (t == NULL) {

     st_fail("out of memory");

@@ -71,5 +71,5 @@

     exit(2);

   }

-  return ptr;

+  return t;

 }