Resync

Author: LibretroAdmin

audio/resampler/drivers/sinc_resampler.c

@@ -35,49 +35,43 @@
 
 static int c89_vscprintf_retro__(const char *fmt, va_list pargs)
 {
-   int retval;
+   int _len;
    va_list argcopy;
    va_copy(argcopy, pargs);
-   retval = vsnprintf(NULL, 0, fmt, argcopy);
+   _len = vsnprintf(NULL, 0, fmt, argcopy);
    va_end(argcopy);
-   return retval;
+   return _len;
 }
 #endif
 
 /* http://stackoverflow.com/questions/2915672/snprintf-and-visual-studio-2010 */
 
 int c99_vsnprintf_retro__(char *s, size_t len, const char *fmt, va_list ap)
 {
-   int count = -1;
-
+   int _len = -1;
    if (len != 0)
    {
 #if (_MSC_VER <= 1310)
-      count = _vsnprintf(s, len - 1, fmt, ap);
+      _len = _vsnprintf(s, len - 1, fmt, ap);
 #else
-      count = _vsnprintf_s(s, len, len - 1, fmt, ap);
+      _len = _vsnprintf_s(s, len, len - 1, fmt, ap);
 #endif
    }
-
-   if (count == -1)
-       count = _vscprintf(fmt, ap);
-
+   if (_len == -1)
+       _len = _vscprintf(fmt, ap);
    /* there was no room for a NULL, so truncate the last character */
-   if (count == len && len)
+   if (_len == len && len)
       s[len - 1] = '\0';
-
-   return count;
+   return _len;
 }
 
 int c99_snprintf_retro__(char *s, size_t len, const char *fmt, ...)
 {
-   int count;
+   int _len;
    va_list ap;
-
    va_start(ap, fmt);
-   count = c99_vsnprintf_retro__(s, len, fmt, ap);
+   _len = c99_vsnprintf_retro__(s, len, fmt, ap);
    va_end(ap);
-
-   return count;
+   return _len;
 }
 #endif

compat/compat_snprintf.c

@@ -34,11 +34,11 @@
 
 int c89_vscprintf_retro__(const char *format, va_list pargs)
 {
-   int retval;
+   int _len;
    va_list argcopy;
    va_copy(argcopy, pargs);
-   retval = vsnprintf(NULL, 0, format, argcopy);
+   _len = vsnprintf(NULL, 0, format, argcopy);
    va_end(argcopy);
-   return retval;
+   return _len;
 }
 #endif

compat/compat_vscprintf.c

@@ -338,7 +338,6 @@ bool file_archive_extract_file(
       char *s, size_t len)
 {
    struct archive_extract_userdata userdata;
-   bool ret                                 = true;
    struct string_list *list                 = string_split(valid_exts, "|");
 
    userdata.archive_path[0]                 = '\0';
@@ -353,37 +352,22 @@ bool file_archive_extract_file(
    userdata.transfer                        = NULL;
    userdata.dec                             = NULL;
 
-   if (!list)
-   {
-      ret = false;
-      goto end;
-   }
-
-   if (!file_archive_walk(archive_path, valid_exts,
-            file_archive_extract_cb, &userdata))
-   {
-      /* Parsing file archive failed. */
-      ret = false;
-      goto end;
-   }
-
-   if (!userdata.found_file)
+   if (     list
+         && file_archive_walk(archive_path, valid_exts,
+            file_archive_extract_cb, &userdata)
+         && userdata.found_file
+      )
    {
-      /* Didn't find any file that matched valid extensions
-       * for libretro implementation. */
-      ret = false;
-      goto end;
+      if (!string_is_empty(userdata.first_extracted_file_path))
+         strlcpy(s, userdata.first_extracted_file_path, len);
+      return true;
    }
 
-   if (!string_is_empty(userdata.first_extracted_file_path))
-      strlcpy(s, userdata.first_extracted_file_path, len);
-
-end:
    if (userdata.first_extracted_file_path)
       free(userdata.first_extracted_file_path);
    if (list)
       string_list_free(list);
-   return ret;
+   return false;
 }
 
 /* Warning: 'list' must zero initialised before
@@ -533,26 +517,33 @@ static struct string_list *file_archive_filename_split(const char *path)
    {
       /* add archive path to list first */
       if (!string_list_append_n(list, path, (unsigned)(delim - path), attr))
-         goto error;
+      {
+         string_list_free(list);
+         return NULL;
+      }
 
       /* now add the path within the archive */
       delim++;
 
       if (*delim)
       {
          if (!string_list_append(list, delim, attr))
-            goto error;
+         {
+            string_list_free(list);
+            return NULL;
+         }
       }
    }
    else
+   {
       if (!string_list_append(list, path, attr))
-         goto error;
+      {
+         string_list_free(list);
+         return NULL;
+      }
+   }
 
    return list;
-
-error:
-   string_list_free(list);
-   return NULL;
 }
 
 /* Generic compressed file loader.

file/archive_file.c

@@ -99,12 +99,12 @@ static bool zlib_stream_decompress_data_to_file_init(
       void *context, file_archive_file_handle_t *handle,
       const uint8_t *cdata, unsigned cmode, uint32_t csize, uint32_t size)
 {
-   zip_context_t *zip_context = (zip_context_t *)context;
-   struct file_archive_transfer *state = zip_context->state;
-   uint8_t local_header_buf[4];
+   int64_t offsetData;
    uint8_t *local_header;
    uint32_t offsetNL, offsetEL;
-   int64_t offsetData;
+   uint8_t local_header_buf[4];
+   zip_context_t *zip_context = (zip_context_t *)context;
+   struct file_archive_transfer *state = zip_context->state;
 
    /* free previous data and stream if left unfinished */
    zip_context_free_stream(zip_context, false);
@@ -118,7 +118,10 @@ static bool zlib_stream_decompress_data_to_file_init(
    {
       filestream_seek(state->archive_file, (int64_t)(size_t)cdata + 26, RETRO_VFS_SEEK_POSITION_START);
       if (filestream_read(state->archive_file, local_header_buf, 4) != 4)
-         goto error;
+      {
+         zip_context_free_stream(zip_context, false);
+         return false;
+      }
       local_header = local_header_buf;
    }
 
@@ -156,34 +159,31 @@ static bool zlib_stream_decompress_data_to_file_init(
       {
          free(zip_context->zstream);
          zip_context->zstream = NULL;
-         goto error;
+         zip_context_free_stream(zip_context, false);
+         return false;
       }
    }
 
    return true;
-
-error:
-   zip_context_free_stream(zip_context, false);
-   return false;
 }
 
 static int zlib_stream_decompress_data_to_file_iterate(
       void *context, file_archive_file_handle_t *handle)
 {
+   int64_t rd;
    zip_context_t *zip_context = (zip_context_t *)context;
    struct file_archive_transfer *state = zip_context->state;
-   int64_t rd;
 
    if (zip_context->cmode == ZIP_MODE_STORED)
    {
-      #ifdef HAVE_MMAP
+#ifdef HAVE_MMAP
       /* Simply copy the data to the output buffer */
       if (zip_context->state->archive_mmap_data)
          memcpy(zip_context->decompressed_data,
-                zip_context->state->archive_mmap_data + (size_t)zip_context->fdoffset,
-                zip_context->usize);
+               zip_context->state->archive_mmap_data + (size_t)zip_context->fdoffset,
+               zip_context->usize);
       else
-      #endif
+#endif
       {
          /* Read the entire file to memory */
          filestream_seek(state->archive_file, zip_context->fdoffset, RETRO_VFS_SEEK_POSITION_START);
@@ -204,15 +204,15 @@ static int zlib_stream_decompress_data_to_file_iterate(
       if (!zip_context->zstream)
          return 1;
 
-      #ifdef HAVE_MMAP
+#ifdef HAVE_MMAP
       if (state->archive_mmap_data)
       {
          /* Decompress from the mapped file */
          dptr = state->archive_mmap_data + (size_t)zip_context->fdoffset + zip_context->boffset;
          rd   = to_read;
       }
       else
-      #endif
+#endif
       {
          /* Read some compressed data from file to the temp buffer */
          filestream_seek(state->archive_file,

file/archive_file_zlib.c

@@ -634,20 +634,21 @@ static bool config_file_parse_line(config_file_t *conf,
    if (*line != '=')
    {
       list->value = NULL;
-      goto error;
+      list->key   = NULL;
+      free(key);
+      return false;
    }
 
    line++;
 
    if (!(list->value   = config_file_extract_value(line)))
-      goto error;
+   {
+      list->key   = NULL;
+      free(key);
+      return false;
+   }
 
    return true;
-
-error:
-   list->key   = NULL;
-   free(key);
-   return false;
 }
 
 static int config_file_from_string_internal(

file/config_file.c

@@ -805,7 +805,11 @@ char *path_resolve_realpath(char *s, size_t len, bool resolve_symlinks)
          tmp[t++] = '/';
 
       if (string_is_empty(s))
-         goto end;
+      {
+         tmp[t] = '\0';
+         strlcpy(s, tmp, len);
+         return s;
+      }
 
       p = s;
    }
@@ -851,10 +855,8 @@ char *path_resolve_realpath(char *s, size_t len, bool resolve_symlinks)
          while (p <= next)
             tmp[t++] = *p++;
       }
-   }while(next < buf_end);
-
+   } while(next < buf_end);
 
-end:
    tmp[t] = '\0';
    strlcpy(s, tmp, len);
    return s;

file/file_path.c

@@ -113,12 +113,15 @@ static void *nbio_stdio_open(const char * filename, unsigned mode)
    if (!f)
       return NULL;
 
-   handle                = (struct nbio_stdio_t*)malloc(sizeof(struct nbio_stdio_t));
+   handle = (struct nbio_stdio_t*)malloc(sizeof(struct nbio_stdio_t));
 
    if (!handle)
-      goto error;
+   {
+      fclose(f);
+      return NULL;
+   }
 
-   handle->f             = f;
+   handle->f = f;
 
    switch (mode)
    {
@@ -143,20 +146,18 @@ static void *nbio_stdio_open(const char * filename, unsigned mode)
 #endif
 
    if (len && !buf)
-      goto error;
+   {
+      free(handle);
+      fclose(f);
+      return NULL;
+   }
 
    handle->data          = buf;
    handle->len           = len;
    handle->progress      = handle->len;
    handle->op            = -2;
 
    return handle;
-
-error:
-   if (handle)
-      free(handle);
-   fclose(f);
-   return NULL;
 }
 
 static void nbio_stdio_begin_read(void *data)