shithub: sox

Download patch

ref: ede09d3239241074fc19b4ee99ee67b03001f3c9
parent: ffc38e235465ccc03e7719b1fa3a20f29eae9eae
author: cbagwell <cbagwell>
date: Fri Oct 1 09:44:33 EDT 2004

Put newline before command additions, not after.

--- a/src/wav.c
+++ b/src/wav.c
@@ -925,6 +925,7 @@
             {
                 if (st_reads(ft,magic,4) == ST_EOF)
                     break;
+
                 if (strncmp(magic,"INFO",4) == 0)
                 {
                     /*Skip*/
@@ -936,8 +937,6 @@
                         break;
                     if (strncmp(magic,"ICRD",4) == 0)
                     {
-                        int needs_return = 0;
-
                         st_report("Chunk ICRD");
                         if (len > 254)
                         {
@@ -947,13 +946,10 @@
                         st_reads(ft,text,len);
                         if (strlen(ft->comment) + strlen(text) < 254)
                         {
-                            if (strlen(ft->comment) != 0)
-                                needs_return = 1;
+                            if (ft->comment[0] != 0)
+                                strcat(ft->comment,"\n");
 
                             strcat(ft->comment,text);
-
-                            if (needs_return)
-                                strcat(ft->comment,"\n");
                         }
                         if (strlen(text) < len)
                            st_seek(ft, len - strlen(text), SEEK_CUR); 
@@ -960,8 +956,6 @@
                     } 
                     else if (strncmp(magic,"ISFT",4) == 0)
                     {
-                        int needs_return = 0;
-
                         st_report("Chunk ISFT");
                         if (len > 254)
                         {
@@ -971,13 +965,10 @@
                         st_reads(ft,text,len);
                         if (strlen(ft->comment) + strlen(text) < 254)
                         {
-                            if (strlen(ft->comment) != 0)
-                                needs_return = 1;
+                            if (ft->comment[0] != 0)
+                                strcat(ft->comment,"\n");
 
                             strcat(ft->comment,text);
-
-                            if (needs_return)
-                                strcat(ft->comment,"\n");
                         }
                         if (strlen(text) < len)
                            st_seek(ft, len - strlen(text), SEEK_CUR);