C89 cleanups part 2

Author: Alcaro

config.def.h

@@ -128,7 +128,7 @@ enum
    MENU_XMB,
 
    RECORD_FFMPEG,
-   RECORD_NULL,
+   RECORD_NULL
 };
 
 #if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) || defined(__CELLOS_LV2__)

configuration.c

@@ -852,6 +852,9 @@ static config_file_t *open_default_config_file(void)
    (void)conf_path;
    (void)app_path;
    (void)saved;
+   
+   const char *xdg; (void)xdg;
+   const char *home; (void)home;
 
 #if defined(_WIN32) && !defined(_XBOX)
    fill_pathname_application_path(app_path, sizeof(app_path));
@@ -899,7 +902,7 @@ static config_file_t *open_default_config_file(void)
       RARCH_WARN("Created new config file in: \"%s\".\n", conf_path);
    }
 #elif defined(OSX)
-   const char *home = getenv("HOME");
+   home = getenv("HOME");
 
    if (!home)
       return NULL;
@@ -935,8 +938,8 @@ static config_file_t *open_default_config_file(void)
       RARCH_WARN("Created new config file in: \"%s\".\n", conf_path);
    }
 #elif !defined(__CELLOS_LV2__) && !defined(_XBOX)
-   const char *xdg  = getenv("XDG_CONFIG_HOME");
-   const char *home = getenv("HOME");
+   xdg  = getenv("XDG_CONFIG_HOME");
+   home = getenv("HOME");
 
    /* XDG_CONFIG_HOME falls back to $HOME/.config. */
    if (xdg)
@@ -1518,9 +1521,12 @@ static bool config_load_file(const char *path, bool set_defaults)
 
    CONFIG_GET_BOOL_BASE(conf, settings, rewind_enable, "rewind_enable");
 
-   int buffer_size = 0;
-   if (config_get_int(conf, "rewind_buffer_size", &buffer_size))
-      settings->rewind_buffer_size = buffer_size * UINT64_C(1000000);
+   {
+      /* ugly hack around C89 not allowing mixing declarations and code */
+      int buffer_size = 0;
+      if (config_get_int(conf, "rewind_buffer_size", &buffer_size))
+         settings->rewind_buffer_size = buffer_size * UINT64_C(1000000);
+   }
 
    CONFIG_GET_INT_BASE(conf, settings, rewind_granularity, "rewind_granularity");
    CONFIG_GET_FLOAT_BASE(conf, settings, slowmotion_ratio, "slowmotion_ratio");
@@ -1821,12 +1827,10 @@ bool config_load_override(void)
    else
       RARCH_LOG("No core-specific overrides found at %s.\n", core_path);
 
-   new_conf = NULL;
-
-   // Create a new config file from game_path
+   /* Create a new config file from game_path */
    new_conf = config_file_new(game_path);
 
-   // If a game override exists, add it's location to append_config_path
+   /* If a game override exists, add it's location to append_config_path */
    if (new_conf)
    {
       RARCH_LOG("Game-specific overrides found at %s. Appending.\n", game_path);

dynamic.c

@@ -159,12 +159,13 @@ static dylib_t libretro_get_system_info_lib(const char *path,
       struct retro_system_info *info, bool *load_no_content)
 {
    dylib_t lib = dylib_load(path);
+   void (*proc)(struct retro_system_info*);
+   
    if (!lib)
       return NULL;
 
-   void (*proc)(struct retro_system_info*) =
-      (void (*)(struct retro_system_info*))dylib_proc(lib,
-            "retro_get_system_info");
+   proc = (void (*)(struct retro_system_info*))
+      dylib_proc(lib, "retro_get_system_info");
 
    if (!proc)
    {
@@ -176,10 +177,10 @@ static dylib_t libretro_get_system_info_lib(const char *path,
 
    if (load_no_content)
    {
+      void (*set_environ)(retro_environment_t);
       *load_no_content = false;
-      void (*set_environ)(retro_environment_t) =
-         (void (*)(retro_environment_t))dylib_proc(lib,
-               "retro_set_environment");
+      set_environ = (void (*)(retro_environment_t))
+         dylib_proc(lib, "retro_set_environment");
 
       if (!set_environ)
          return lib;
@@ -735,6 +736,13 @@ bool rarch_environment_cb(unsigned cmd, void *data)
          unsigned retro_id, retro_port;
          const struct retro_input_descriptor *desc = NULL;
 
+         static const char *libretro_btn_desc[] = {
+            "B (bottom)", "Y (left)", "Select", "Start",
+            "D-Pad Up", "D-Pad Down", "D-Pad Left", "D-Pad Right",
+            "A (right)", "X (up)",
+            "L", "R", "L2", "R2", "L3", "R3",
+         };
+
          memset(system->input_desc_btn, 0,
                sizeof(system->input_desc_btn));
 
@@ -792,13 +800,6 @@ bool rarch_environment_cb(unsigned cmd, void *data)
                system->input_desc_btn[retro_port][retro_id] = desc->description;
          }
 
-         static const char *libretro_btn_desc[] = {
-            "B (bottom)", "Y (left)", "Select", "Start",
-            "D-Pad Up", "D-Pad Down", "D-Pad Left", "D-Pad Right",
-            "A (right)", "X (up)",
-            "L", "R", "L2", "R2", "L3", "R3",
-         };
-
          RARCH_LOG("Environ SET_INPUT_DESCRIPTORS:\n");
          for (p = 0; p < settings->input.max_users; p++)
          {
@@ -933,11 +934,11 @@ bool rarch_environment_cb(unsigned cmd, void *data)
 #if defined(HAVE_THREADS) && !defined(__CELLOS_LV2__)
       case RETRO_ENVIRONMENT_SET_AUDIO_CALLBACK:
       {
-         RARCH_LOG("Environ SET_AUDIO_CALLBACK.\n");
          const struct retro_audio_callback *info = 
             (const struct retro_audio_callback*)data;
+         RARCH_LOG("Environ SET_AUDIO_CALLBACK.\n");
 
-         if (driver->recording_data) // A/V sync is a must.
+         if (driver->recording_data) /* A/V sync is a must. */
             return false;
 
 #ifdef HAVE_NETPLAY

file_path_special.c

@@ -122,16 +122,16 @@ void fill_pathname_abbreviate_special(char *out_path,
    char application_dir[PATH_MAX_LENGTH] = {0};
    const char                      *home = getenv("HOME");
 
-   fill_pathname_application_path(application_dir, sizeof(application_dir));
-   path_basedir(application_dir);
-
    /* application_dir could be zero-string. Safeguard against this.
     *
     * Keep application dir in front of home, moving app dir to a
     * new location inside home would break otherwise. */
 
-   const char *candidates[3] = { application_dir, home, NULL };
+   const char *candidates[3] = { application_dir, home, NULL }; /* ugly hack - use application_dir before filling it in. C89 reasons */
    const char *notations[3] = { ":", "~", NULL };
+
+   fill_pathname_application_path(application_dir, sizeof(application_dir));
+   path_basedir(application_dir);
 
    for (i = 0; candidates[i]; i++)
    {
@@ -197,24 +197,27 @@ void fill_pathname_application_path(char *buf, size_t size)
       }
    }
 #else
-   *buf = '\0';
-   pid_t pid = getpid(); 
-   char link_path[PATH_MAX_LENGTH] = {0};
-   /* Linux, BSD and Solaris paths. Not standardized. */
-   static const char *exts[] = { "exe", "file", "path/a.out" };
-   for (i = 0; i < ARRAY_SIZE(exts); i++)
    {
-      snprintf(link_path, sizeof(link_path), "/proc/%u/%s",
-            (unsigned)pid, exts[i]);
-      ssize_t ret = readlink(link_path, buf, size - 1);
-      if (ret >= 0)
+      *buf = '\0';
+      pid_t pid = getpid(); 
+      char link_path[PATH_MAX_LENGTH] = {0};
+      /* Linux, BSD and Solaris paths. Not standardized. */
+      static const char *exts[] = { "exe", "file", "path/a.out" };
+      for (i = 0; i < ARRAY_SIZE(exts); i++)
       {
-         buf[ret] = '\0';
-         return;
+         ssize_t ret;
+         snprintf(link_path, sizeof(link_path), "/proc/%u/%s",
+               (unsigned)pid, exts[i]);
+         ret = readlink(link_path, buf, size - 1);
+         if (ret >= 0)
+         {
+            buf[ret] = '\0';
+            return;
+         }
       }
    }
 
-   /* Cannot resolve application path! This should not happen. */
+   RARCH_ERR("Cannot resolve application path! This should not happen.");
 #endif
 }
 #endif

frontend/drivers/platform_linux.c

@@ -348,13 +348,10 @@ bool frontend_linux_powerstate_check_apm(enum frontend_powerstate *state,
    else
       *state = FRONTEND_POWERSTATE_ON_POWER_SOURCE;
 
-   const int pct = battery_percent;
-   const int secs = battery_time;
-
-   if (pct >= 0)         /* -1 == unknown */
-      *percent = (pct > 100) ? 100 : pct; /* clamp between 0%, 100% */
-   if (secs >= 0)        /* -1 == unknown */
-      *seconds = secs;
+   if (battery_percent >= 0)         /* -1 == unknown */
+      *percent = (battery_percent > 100) ? 100 : battery_percent; /* clamp between 0%, 100% */
+   if (battery_time >= 0)            /* -1 == unknown */
+      *seconds = battery_time;
 
    return true;
 }
@@ -464,7 +461,7 @@ static void frontend_linux_get_os(char *s, size_t len, int *major, int *minor)
    if (uname(&buffer) != 0)
       return;
 
-   sscanf(buffer.release, "%u.%u.%u", major, minor, &krel);
+   sscanf(buffer.release, "%d.%d.%d", major, minor, &krel);
    strlcpy(s, "Linux", len);
 }
 

gfx/common/x11_common.c

@@ -66,11 +66,11 @@ static Atom XA_NET_MOVERESIZE_WINDOW;
 
 void x11_windowed_fullscreen(Display *dpy, Window win)
 {
+   XEvent xev = {0};
+
    XA_INIT(_NET_WM_STATE);
    XA_INIT(_NET_WM_STATE_FULLSCREEN);
 
-   XEvent xev = {0};
-
    xev.xclient.type = ClientMessage;
    xev.xclient.send_event = True;
    xev.xclient.message_type = XA_NET_WM_STATE;

gfx/drivers/gl.c

@@ -1370,37 +1370,41 @@ static INLINE void gl_copy_frame(gl_t *gl, const void *frame,
       }
    }
 #elif defined(HAVE_PSGL)
-   unsigned h;
-   size_t buffer_addr        = gl->tex_w * gl->tex_h * gl->tex_index * gl->base_size;
-   size_t buffer_stride      = gl->tex_w * gl->base_size;
-   const uint8_t *frame_copy = frame;
-   size_t frame_copy_size    = width * gl->base_size;
-
-   uint8_t *buffer = (uint8_t*)glMapBuffer(
-         GL_TEXTURE_REFERENCE_BUFFER_SCE, GL_READ_WRITE) + buffer_addr;
-   for (h = 0; h < height; h++, buffer += buffer_stride, frame_copy += pitch)
-      memcpy(buffer, frame_copy, frame_copy_size);
-
-   glUnmapBuffer(GL_TEXTURE_REFERENCE_BUFFER_SCE);
-#else
-   const GLvoid *data_buf = frame;
-   glPixelStorei(GL_UNPACK_ALIGNMENT, video_pixel_get_alignment(pitch));
-
-   if (gl->base_size == 2 && !gl->have_es2_compat)
    {
-      /* Convert to 32-bit textures on desktop GL. */
-      gl_convert_frame_rgb16_32(gl, gl->conv_buffer,
-            frame, width, height, pitch);
-      data_buf = gl->conv_buffer;
+      unsigned h;
+      size_t buffer_addr        = gl->tex_w * gl->tex_h * gl->tex_index * gl->base_size;
+      size_t buffer_stride      = gl->tex_w * gl->base_size;
+      const uint8_t *frame_copy = frame;
+      size_t frame_copy_size    = width * gl->base_size;
+
+      uint8_t *buffer = (uint8_t*)glMapBuffer(
+            GL_TEXTURE_REFERENCE_BUFFER_SCE, GL_READ_WRITE) + buffer_addr;
+      for (h = 0; h < height; h++, buffer += buffer_stride, frame_copy += pitch)
+         memcpy(buffer, frame_copy, frame_copy_size);
+
+      glUnmapBuffer(GL_TEXTURE_REFERENCE_BUFFER_SCE);
    }
-   else
-      glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch / gl->base_size);
+#else
+   {
+      const GLvoid *data_buf = frame;
+      glPixelStorei(GL_UNPACK_ALIGNMENT, video_pixel_get_alignment(pitch));
 
-   glTexSubImage2D(GL_TEXTURE_2D,
-         0, 0, 0, width, height, gl->texture_type,
-         gl->texture_fmt, data_buf);
+      if (gl->base_size == 2 && !gl->have_es2_compat)
+      {
+         /* Convert to 32-bit textures on desktop GL. */
+         gl_convert_frame_rgb16_32(gl, gl->conv_buffer,
+               frame, width, height, pitch);
+         data_buf = gl->conv_buffer;
+      }
+      else
+         glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch / gl->base_size);
+
+      glTexSubImage2D(GL_TEXTURE_2D,
+            0, 0, 0, width, height, gl->texture_type,
+            gl->texture_fmt, data_buf);
 
-   glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+      glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+   }
 #endif
    RARCH_PERFORMANCE_STOP(copy_frame);
 }
@@ -2639,7 +2643,7 @@ static bool gl_set_shader(void *data,
    {
       unsigned textures = gl->shader->get_prev_textures() + 1;
 
-      if (textures > gl->textures) // Have to reinit a bit.
+      if (textures > gl->textures) /* Have to reinit a bit. */
       {
 #if defined(HAVE_FBO)
          gl_deinit_hw_render(gl);

gfx/drivers/sdl2_gfx.c

@@ -186,20 +186,22 @@ static void sdl2_render_msg(sdl2_video_t *vid, const char *msg)
       tex_x  = gly->atlas_offset_x;
       tex_y  = gly->atlas_offset_y;
 
-      SDL_Rect srcrect = {
-         tex_x, tex_y,
-         (int)gly->width, (int)gly->height
-      };
-
-      SDL_Rect dstrect = {
-         x + delta_x + off_x, y + delta_y + off_y,
-         (int)gly->width, (int)gly->height
-      };
-
-      SDL_RenderCopyEx(vid->renderer, vid->font.tex, &srcrect, &dstrect, 0, NULL, SDL_FLIP_NONE);
-
-      delta_x += gly->advance_x;
-      delta_y -= gly->advance_y;
+      {
+         SDL_Rect srcrect = {
+            tex_x, tex_y,
+            (int)gly->width, (int)gly->height
+         };
+
+         SDL_Rect dstrect = {
+            x + delta_x + off_x, y + delta_y + off_y,
+            (int)gly->width, (int)gly->height
+         };
+
+         SDL_RenderCopyEx(vid->renderer, vid->font.tex, &srcrect, &dstrect, 0, NULL, SDL_FLIP_NONE);
+   
+         delta_x += gly->advance_x;
+         delta_y -= gly->advance_y;
+      }
    }
 }
 
@@ -250,8 +252,9 @@ static void sdl2_init_renderer(sdl2_video_t *vid)
 
 static void sdl_refresh_renderer(sdl2_video_t *vid)
 {
+   SDL_Rect r;
    SDL_RenderClear(vid->renderer);
-   SDL_Rect r = { vid->vp.x, vid->vp.y, (int)vid->vp.width, (int)vid->vp.height };
+   r = (SDL_Rect){ vid->vp.x, vid->vp.y, (int)vid->vp.width, (int)vid->vp.height };
    SDL_RenderSetViewport(vid->renderer, &r);
 
    /* breaks int scaling */
@@ -370,6 +373,7 @@ static void *sdl2_gfx_init(const video_info_t *video, const input_driver_t **inp
    int i;
    unsigned flags;
    settings_t *settings = config_get_ptr();
+   sdl2_video_t *vid;
 
 #ifdef HAVE_X11
    XInitThreads();
@@ -383,7 +387,7 @@ static void *sdl2_gfx_init(const video_info_t *video, const input_driver_t **inp
    else if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)
       return NULL;
 
-   sdl2_video_t *vid = (sdl2_video_t*)calloc(1, sizeof(*vid));
+   vid = (sdl2_video_t*)calloc(1, sizeof(*vid));
    if (!vid)
       return NULL;
 

gfx/drivers_context/gfx_null_ctx.c

@@ -14,7 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// Null context.
+/* Null context. */
 
 #include "../../driver.h"
 #include "../video_context_driver.h"