Struct reorders

tasks/task_database.c

@@ -45,30 +45,30 @@
 
 typedef struct database_state_handle
 {
-   uint32_t crc;
-   uint32_t archive_crc;
-   size_t list_index;
-   size_t entry_index;
-   uint8_t *buf;
-   char archive_name[511];
-   char serial[4096];
    database_info_list_t *info;
    struct string_list *list;
+   uint8_t *buf;
+   size_t list_index;
+   size_t entry_index;
+   uint32_t crc;
+   uint32_t archive_crc;
+   char archive_name[511];
+   char serial[4096];
 } database_state_handle_t;
 
 typedef struct db_handle
 {
-   playlist_config_t playlist_config;
-   bool is_directory;
-   bool scan_started;
-   bool scan_without_core_match;
-   bool show_hidden_files;
-   unsigned status;
    char *playlist_directory;
    char *content_database_path;
    char *fullpath;
    database_info_handle_t *handle;
    database_state_handle_t state;
+   playlist_config_t playlist_config; /* size_t alignment */
+   unsigned status;
+   bool is_directory;
+   bool scan_started;
+   bool scan_without_core_match;
+   bool show_hidden_files;
 } db_handle_t;
 
 /* Forward declarations */

tasks/task_database_cue.c

@@ -50,6 +50,8 @@
 #define MODETEST_VAL    0xffffff00
 #endif
 
+/* TODO/FIXME - reorder this according to CODING-GUIDELINES
+ * and make sure LUT table below conforms */
 struct magic_entry
 {
    int32_t offset;

tasks/task_file_transfer.h

@@ -59,23 +59,25 @@ typedef int (*transfer_cb_t)(void *data, size_t len);
 
 typedef struct nbio_handle
 {
-   enum nbio_type type;
-   bool is_finished;
-   unsigned status;
-   unsigned pos_increment;
-   uint32_t status_flags;
    void *data;
    char *path;
    struct nbio_t *handle;
    msg_queue_t *msg_queue;
    transfer_cb_t  cb;
+
+   unsigned status;
+   unsigned pos_increment;
+   uint32_t status_flags;
+
+   enum nbio_type type;
+   bool is_finished;
 } nbio_handle_t;
 
 typedef struct
 {
+   void *user_data;
    enum msg_hash_enums enum_idx;
    char path[PATH_MAX_LENGTH];
-   void *user_data;
 } file_transfer_t;
 
 void* task_push_http_transfer_file(const char* url, bool mute, const char* type,

tasks/task_http.c

@@ -39,23 +39,23 @@ enum http_status_enum
 
 struct http_transfer_info
 {
-   char url[255];
    int progress;
+   char url[255];
 };
 
 struct http_handle
 {
+   struct http_t *handle;
+   transfer_cb_t  cb;
    struct
    {
       struct http_connection_t *handle;
       transfer_cb_t  cb;
-      char elem1[255];
-      char url[255];
    } connection;
-   struct http_t *handle;
-   transfer_cb_t  cb;
    unsigned status;
    bool error;
+   char connection_elem[255];
+   char connection_url[255];
 };
 
 typedef struct http_transfer_info http_transfer_info_t;
@@ -225,7 +225,7 @@ static bool task_http_finder(retro_task_t *task, void *user_data)
    if (!http)
       return false;
 
-   return string_is_equal(http->connection.url, (const char*)user_data);
+   return string_is_equal(http->connection_url, (const char*)user_data);
 }
 
 static bool task_http_retriever(retro_task_t *task, void *data)
@@ -238,7 +238,7 @@ static bool task_http_retriever(retro_task_t *task, void *data)
       return false;
 
    /* Fill HTTP info link */
-   strlcpy(info->url, http->connection.url, sizeof(info->url));
+   strlcpy(info->url, http->connection_url, sizeof(info->url));
    info->progress = task_get_progress(task);
    return true;
 }
@@ -282,17 +282,17 @@ static void* task_push_http_transfer_generic(
 
    http->connection.handle   = conn;
    http->connection.cb       = &cb_http_conn_default;
-   http->connection.elem1[0] = '\0';
-   http->connection.url[0]   = '\0';
+   http->connection_elem[0] = '\0';
+   http->connection_url[0]   = '\0';
    http->handle              = NULL;
    http->cb                  = NULL;
    http->status              = 0;
    http->error               = false;
 
    if (type)
-      strlcpy(http->connection.elem1, type, sizeof(http->connection.elem1));
+      strlcpy(http->connection_elem, type, sizeof(http->connection_elem));
 
-   strlcpy(http->connection.url, url, sizeof(http->connection.url));
+   strlcpy(http->connection_url, url, sizeof(http->connection_url));
 
    http->status            = HTTP_STATUS_CONNECTION_TRANSFER;
    t                       = task_init();

tasks/task_image.c

@@ -41,18 +41,18 @@ enum image_status_enum
 
 struct nbio_image_handle
 {
+   void *handle;
+   transfer_cb_t  cb;
+   struct texture_image ti; /* ptr alignment */
+   size_t size;
+   int processing_final_state;
+   unsigned frame_duration;
+   unsigned upscale_threshold;
    enum image_type_enum type;
    enum image_status_enum status;
    bool is_blocking;
    bool is_blocking_on_processing;
    bool is_finished;
-   int processing_final_state;
-   unsigned frame_duration;
-   size_t size;
-   unsigned upscale_threshold;
-   void *handle;
-   transfer_cb_t  cb;
-   struct texture_image ti;
 };
 
 static int cb_image_upload_generic(void *data, size_t len)