Packman Build Service PMBS

File libmp3splt.patch of Package libmp3splt (Revision 10)

Currently displaying revision 10 , Show latest

--- a/plugins/mp3.c
+++ b/plugins/mp3.c
@@ -1301,8 +1301,10 @@ static splt_mp3_state *splt_mp3_info(FIL
         //Handle misplaced Xing header in mp3 files with CRC
         else 
         {
-          if (xing_word == ((SPLT_MP3_XING_MAGIC << 16) & 0xffffffffL) 
-              || xing_word == ((SPLT_MP3_INFO_MAGIC << 16) & 0xffffffffL))
+          unsigned long x = SPLT_MP3_XING_MAGIC;
+          unsigned long i = SPLT_MP3_INFO_MAGIC;
+          if (xing_word == ((x << 16) & 0xffffffffL)
+              || xing_word == ((i << 16) & 0xffffffffL))
           {
             ptr = start;
             mad_bit_skip(&ptr, 16);
--- a/src/freedb.c
+++ b/src/freedb.c
@@ -75,7 +75,7 @@ char *get_cgi_path_and_cut_server(int ty
   return cgi_path;
 }
 
-static char *splt_freedb_get_server(const char search_server[256])
+static char *splt_freedb_get_server(const char *search_server)
 {
   char *server = NULL;
 
@@ -155,7 +155,7 @@ the default which currently means freedb
 80). 
 */
 int splt_freedb_process_search(splt_state *state, char *search,
-    int search_type, const char search_server[256],
+    int search_type, const char *search_server,
     int port_number)
 {
   int error = SPLT_FREEDB_OK;
@@ -318,7 +318,7 @@ uses
 \todo see when we don't have a valid port or get_type
 */
 char *splt_freedb_get_file(splt_state *state, int disc_id, int *error,
-    int get_type, const char cddb_get_server[256], int port_number)
+    int get_type, const char *cddb_get_server, int port_number)
 {
   int err = SPLT_FREEDB_FILE_OK;
   *error = err;
--- a/src/mp3splt.c
+++ b/src/mp3splt.c
@@ -502,12 +502,7 @@ int mp3splt_progress_get_type(const splt
 
 char *mp3splt_progress_get_filename_shorted(const splt_progress *p_bar)
 {
-  if (p_bar->filename_shorted)
-  {
     return strdup(p_bar->filename_shorted);
-  }
-
-  return NULL;
 }
 
 int mp3splt_progress_get_current_split(const splt_progress *p_bar)
@@ -1481,7 +1476,7 @@ splt_freedb_results *mp3splt_get_freedb_
     const char *search_string,
     splt_code *error,
     int search_type,
-    const char search_server[256],
+    const char *search_server,
     int port)
 {
   int erro = SPLT_OK;
@@ -1580,7 +1575,7 @@ use.
 */
 splt_code mp3splt_write_freedb_file_result(splt_state *state, int disc_id,
     const char *cddb_file, int cddb_get_type,
-    const char cddb_get_server[256], int port)
+    const char *cddb_get_server, int port)
 {
   int erro = SPLT_OK;
   int *err = &erro;
@@ -1958,16 +1953,14 @@ char **mp3splt_find_filenames(splt_state
           }
 
           int fname_size = strlen(filename) + 1;
-          found_files[0] = malloc(sizeof(char) * fname_size);
-          memset(found_files[0], '\0', fname_size);
-
+          found_files[0] = malloc(fname_size);
           if (!found_files[0])
           {
             free(found_files);
             return NULL;
           }
 
-          strncat(found_files[0], filename, fname_size);
+          memcpy(found_files[0], filename, fname_size);
           *num_of_files_found = 1;
         }
       }
--- a/src/string_utils.c
+++ b/src/string_utils.c
@@ -108,9 +108,9 @@ error:
   return NULL;
 }
 
-splt_code splt_su_append_str(char **str, const char *to_append, ...)
+int splt_su_append_str(char **str, const char *to_append, ...)
 {
-  splt_code err = SPLT_OK;
+  int err = SPLT_OK;
   va_list ap;
 
   va_start(ap, to_append);
--- a/src/tags_utils.c
+++ b/src/tags_utils.c
@@ -72,7 +72,7 @@ static splt_tags *splt_tu_duplicate_tags
     if (*error < 0)
     {
       int j = 0;
-      for (j = 0; i < i; j++) { splt_tu_free_one_tags_content(&tags[i]); }
+      for (j = 0; j < i; j++) { splt_tu_free_one_tags_content(&tags[i]); }
       *tags_number = 0;
       return NULL;
     }