Resync

Author: inactive123

audio/audio_mixer.c

@@ -73,56 +73,50 @@ struct audio_mixer_sound
       struct
       {
          /* wav */
-         unsigned frames;
          const float* pcm;
+         unsigned frames;
       } wav;
 
 #ifdef HAVE_STB_VORBIS
       struct
       {
          /* ogg */
-         unsigned size;
          const void* data;
+         unsigned size;
       } ogg;
 #endif
 
 #ifdef HAVE_DR_FLAC
       struct
       {
           /* flac */
-         unsigned size;
          const void* data;
+         unsigned size;
       } flac;
 #endif
 
 #ifdef HAVE_DR_MP3
       struct
       {
           /* mp */
-         unsigned size;
          const void* data;
+         unsigned size;
       } mp3;
 #endif
 
 #ifdef HAVE_IBXM
       struct
       {
          /* mod/s3m/xm */
-         unsigned size;
          const void* data;
+         unsigned size;
       } mod;
 #endif
    } types;
 };
 
 struct audio_mixer_voice
 {
-   bool     repeat;
-   unsigned type;
-   float    volume;
-   audio_mixer_sound_t *sound;
-   audio_mixer_stop_cb_t stop_cb;
-
    union
    {
       struct
@@ -133,61 +127,67 @@ struct audio_mixer_voice
 #ifdef HAVE_STB_VORBIS
       struct
       {
+         stb_vorbis *stream;
+         void       *resampler_data;
+         const retro_resampler_t *resampler;
+         float      *buffer;
          unsigned    position;
          unsigned    samples;
          unsigned    buf_samples;
-         float*      buffer;
          float       ratio;
-         stb_vorbis *stream;
-         void       *resampler_data;
-         const retro_resampler_t *resampler;
       } ogg;
 #endif
 
 #ifdef HAVE_DR_FLAC
       struct
       {
-         unsigned    position;
-         unsigned    samples;
-         unsigned    buf_samples;
          float*      buffer;
-         float       ratio;
          drflac      *stream;
          void        *resampler_data;
          const retro_resampler_t *resampler;
+         unsigned    position;
+         unsigned    samples;
+         unsigned    buf_samples;
+         float       ratio;
       } flac;
 #endif
 
 #ifdef HAVE_DR_MP3
       struct
       {
+         drmp3       stream;
+         void        *resampler_data;
+         const retro_resampler_t *resampler;
+         float*      buffer;
          unsigned    position;
          unsigned    samples;
          unsigned    buf_samples;
-         float*      buffer;
          float       ratio;
-         drmp3       stream;
-         void        *resampler_data;
-         const retro_resampler_t *resampler;
       } mp3;
 #endif
 
 #ifdef HAVE_IBXM
       struct
       {
-         unsigned          position;
-         unsigned          samples;
-         unsigned          buf_samples;
          int*              buffer;
          struct replay*    stream;
          struct module*    module;
+         unsigned          position;
+         unsigned          samples;
+         unsigned          buf_samples;
       } mod;
 #endif
    } types;
+   audio_mixer_sound_t *sound;
+   audio_mixer_stop_cb_t stop_cb;
+   unsigned type;
+   float    volume;
+   bool     repeat;
+
 };
 
 /* TODO/FIXME - static globals */
-static struct audio_mixer_voice s_voices[AUDIO_MIXER_MAX_VOICES] = {{0}};
+static struct audio_mixer_voice s_voices[AUDIO_MIXER_MAX_VOICES] = {0};
 static unsigned s_rate = 0;
 
 #ifdef HAVE_RWAV

audio/resampler/drivers/nearest_resampler.c

@@ -68,15 +68,9 @@ static void *resampler_nearest_init(const struct resampler_config *config,
 {
    rarch_nearest_resampler_t *re = (rarch_nearest_resampler_t*)
       calloc(1, sizeof(rarch_nearest_resampler_t));
-
-   (void)config;
-   (void)mask;
-
    if (!re)
       return NULL;
-
    re->fraction = 0;
-
    return re;
 }
 

audio/resampler/drivers/sinc_resampler.c

@@ -67,6 +67,13 @@ enum sinc_window
 
 typedef struct rarch_sinc_resampler
 {
+   /* A buffer for phase_table, buffer_l and buffer_r
+    * are created in a single calloc().
+    * Ensure that we get as good cache locality as we can hope for. */
+   float *main_buffer;
+   float *phase_table;
+   float *buffer_l;
+   float *buffer_r;
    unsigned enable_avx;
    unsigned phase_bits;
    unsigned subphase_bits;
@@ -77,14 +84,6 @@ typedef struct rarch_sinc_resampler
    float subphase_mod;
    float kaiser_beta;
    enum sinc_window window_type;
-
-   /* A buffer for phase_table, buffer_l and buffer_r
-    * are created in a single calloc().
-    * Ensure that we get as good cache locality as we can hope for. */
-   float *main_buffer;
-   float *phase_table;
-   float *buffer_l;
-   float *buffer_r;
 } rarch_sinc_resampler_t;
 
 #if defined(__ARM_NEON__) && !defined(DONT_WANT_ARM_OPTIMIZATIONS)

file/archive_file.c

@@ -667,7 +667,7 @@ const struct file_archive_file_backend* file_archive_get_file_backend(const char
 uint32_t file_archive_get_file_crc32(const char *path)
 {
    file_archive_transfer_t state;
-   struct archive_extract_userdata userdata        = {{0}};
+   struct archive_extract_userdata userdata        = {0};
    bool returnerr                                  = false;
    const char *archive_path                        = NULL;
    bool contains_compressed = path_contains_compressed_file(path);

file/archive_file_7z.c

@@ -48,6 +48,7 @@
 
 struct sevenzip_context_t
 {
+   uint8_t *output;
    CFileInStream archiveStream;
    CLookToRead lookStream;
    ISzAlloc allocImp;
@@ -58,7 +59,6 @@ struct sevenzip_context_t
    uint32_t parse_index;
    uint32_t decompress_index;
    uint32_t packIndex;
-   uint8_t *output;
 };
 
 static void *sevenzip_stream_alloc_impl(void *p, size_t size)

file/archive_file_zlib.c

@@ -330,7 +330,7 @@ static int64_t zip_file_read(
 {
    file_archive_transfer_t state            = {ARCHIVE_TRANSFER_INIT};
    decomp_state_t decomp                    = {0};
-   struct archive_extract_userdata userdata = {{0}};
+   struct archive_extract_userdata userdata = {0};
    bool returnerr                           = true;
    int ret                                  = 0;
 

file/nbio/nbio_linux.c

@@ -40,14 +40,12 @@
 
 struct nbio_linux_t
 {
-   int fd;
-   bool busy;
-
+   void* ptr;
    aio_context_t ctx;
    struct iocb cb;
-
-   void* ptr;
    size_t len;
+   int fd;
+   bool busy;
 };
 
 /* there's also a Unix AIO thingy, but it's not in glibc

file/nbio/nbio_orbis.c

@@ -31,18 +31,18 @@
 
 struct nbio_orbis_t
 {
-   int fd;
    void* data;
    size_t progress;
    size_t len;
+   int fd;
+   unsigned int mode;
    /*
     * possible values:
     * NBIO_READ, NBIO_WRITE - obvious
     * -1 - currently doing nothing
     * -2 - the pointer was reallocated since the last operation
     */
    signed char op;
-   unsigned int mode;
 };
 
 static void *nbio_orbis_open(const char * filename, unsigned int mode)

file/nbio/nbio_unixmmap.c

@@ -55,10 +55,10 @@
 
 struct nbio_mmap_unix_t
 {
+   void* ptr;
+   size_t len;
    int fd;
    int map_flags;
-   size_t len;
-   void* ptr;
 };
 
 static void *nbio_mmap_unix_open(const char * filename, unsigned mode)

file/nbio/nbio_windowsmmap.c

@@ -63,9 +63,9 @@
 struct nbio_mmap_win32_t
 {
    HANDLE file;
-   bool is_write;
-   size_t len;
    void* ptr;
+   size_t len;
+   bool is_write;
 };
 
 static void *nbio_mmap_win32_open(const char * filename, unsigned mode)