Style nits to core_info. Compile it in.

Makefile

@@ -22,6 +22,7 @@ OBJ = frontend/frontend.o \
 		core_options.o \
 		compat/compat.o \
 		cheats.o \
+		core_info.o \
 		conf/config_file.o \
 		screenshot.o \
 		gfx/scaler/scaler.o \

Makefile.win

@@ -23,6 +23,7 @@ OBJ = frontend/frontend.o \
 		compat/compat.o \
 		screenshot.o \
 		cheats.o \
+		core_info.o \
 		audio/utils.o \
 		input/overlay.o \
 		fifo_buffer.o \

core_info.c

@@ -23,49 +23,52 @@ core_info_list_t *get_core_info_list(const char *modules_path)
 {
    struct string_list *contents = dir_list_new(modules_path, EXT_EXECUTABLES, false);
 
-   core_info_t *core_info;
+   core_info_t *core_info = NULL;
-   core_info_list_t *core_info_list;
+   core_info_list_t *core_info_list = NULL;
-   unsigned i;
 
    if (!contents)
       return NULL;
 
-   core_info = (core_info_t*)malloc(contents->size * sizeof(core_info_t));
+   core_info_list = (core_info_list_t*)calloc(1, sizeof(*core_info_list));
-   memset(core_info, 0, contents->size * sizeof(core_info_t));
+   if (!core_info_list)
+      goto error;
+
+   core_info = (core_info_t*)calloc(contents->size, sizeof(*core_info));
+   if (!core_info)
+      goto error;
 
-   core_info_list = (core_info_list_t*)malloc(sizeof(core_info_list_t));
-   memset(core_info_list, 0, sizeof(core_info_list_t));
    core_info_list->list = core_info;
    core_info_list->count = contents->size;
 
-   for (i = 0; i < contents->size; i ++)
+   for (size_t i = 0; i < contents->size; i++)
    {
       char buffer[PATH_MAX];
       char info_path[PATH_MAX];
-      char *substr;
    
       core_info[i].path = strdup(contents->elems[i].data);
 
+      // FIXME: Need to do something about this logic.
+      // fill_pathname() *should* be sufficient.
+      //
       // NOTE: This assumes all modules are named module_name_{tag}.ext
       //       {tag} must not contain an underscore. (This isn't true for PC versions)
-      snprintf(buffer, PATH_MAX, "%s", contents->elems[i].data);
+      strlcpy(buffer, contents->elems[i].data, sizeof(buffer));
-      substr = strrchr(buffer, '_');
+      char *substr = strrchr(buffer, '_');
       if (substr)
-         *substr = 0;
+         *substr = '\0';
 
       // NOTE: Can't just use fill_pathname on iOS as it will cut at RetroArch.app;
       //       perhaps fill_pathname shouldn't cut before the last path element.
       if (substr)
          snprintf(info_path, PATH_MAX, "%s.info", buffer);
       else
-         fill_pathname(info_path, buffer, ".info", PATH_MAX);         
+         fill_pathname(info_path, buffer, ".info", sizeof(info_path));
 
       core_info[i].data = config_file_new(info_path);
 
       if (core_info[i].data)
       {
          config_get_string(core_info[i].data, "display_name", &core_info[i].display_name);
-
          if (config_get_string(core_info[i].data, "supported_extensions", &core_info[i].supported_extensions) &&
                core_info[i].supported_extensions)
             core_info[i].supported_extensions_list = string_split(core_info[i].supported_extensions, "|");
@@ -76,18 +79,21 @@ core_info_list_t *get_core_info_list(const char *modules_path)
    }
 
    dir_list_free(contents);
-
    return core_info_list;
+
+error:
+   if (contents)
+      dir_list_free(contents);
+   free_core_info_list(core_info_list);
+   return NULL;
 }
 
 void free_core_info_list(core_info_list_t *core_info_list)
 {
-   int i;
-
    if (!core_info_list)
       return;
 
-   for (i = 0; i < core_info_list->count; i++)
+   for (size_t i = 0; i < core_info_list->count; i++)
    {
       free(core_info_list->list[i].path);
       free(core_info_list->list[i].display_name);
@@ -100,7 +106,7 @@ void free_core_info_list(core_info_list_t *core_info_list)
    free(core_info_list);
 }
 
-bool does_core_support_file(core_info_t* core, const char *path)
+bool does_core_support_file(core_info_t *core, const char *path)
 {
    if (!path || !core || !core->supported_extensions_list)
       return false;

core_info.h

@@ -16,29 +16,31 @@
 #ifndef CORE_INFO_H_
 #define CORE_INFO_H_
 
+#include "conf/config_file.h"
+#include "file.h"
+#include <stddef.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "conf/config_file.h"
-
 typedef struct {
-   char * path;
+   char *path;
-   config_file_t* data;
+   config_file_t *data;
-   char * display_name;
+   char *display_name;
-   char * supported_extensions;
+   char *supported_extensions;
-   struct string_list * supported_extensions_list;
+   struct string_list *supported_extensions_list;
 } core_info_t;
 
 typedef struct {
    core_info_t *list;
-   int count;
+   size_t count;
 } core_info_list_t;
 
 core_info_list_t *get_core_info_list(const char *modules_path);
-void free_core_info_list(core_info_list_t * core_info_list);
+void free_core_info_list(core_info_list_t *core_info_list);
 
-bool does_core_support_file(core_info_t* core, const char *path);
+bool does_core_support_file(core_info_t *core, const char *path);
 
 #ifdef __cplusplus
 }