move other allocs to alloc

alloc/alloc.c

@@ -385,6 +385,54 @@ FlipSocialApp *flip_social_app_alloc()
     return app;
 }
 
+FlipSocialModel *alloc_friends_model()
+{
+    // Allocate memory for each username only if not already allocated
+    FlipSocialModel *friends = malloc(sizeof(FlipSocialModel));
+    if (friends == NULL)
+    {
+        FURI_LOG_E(TAG, "Failed to allocate memory for friends usernames.");
+        return NULL;
+    }
+    return friends;
+}
+
+FlipSocialModel2 *alloc_messages()
+{
+    // Allocate memory for each username only if not already allocated
+    FlipSocialModel2 *users = malloc(sizeof(FlipSocialModel2));
+    if (users == NULL)
+    {
+        FURI_LOG_E(TAG, "Failed to allocate memory for message users");
+        return NULL;
+    }
+    return users;
+}
+
+FlipSocialMessage *alloc_user_messages()
+{
+    // Allocate memory for each username only if not already allocated
+    FlipSocialMessage *messages = malloc(sizeof(FlipSocialMessage));
+    if (messages == NULL)
+    {
+        FURI_LOG_E(TAG, "Failed to allocate memory for messages");
+        return NULL;
+    }
+    return messages;
+}
+
+FlipSocialModel *alloc_explore(void)
+{
+    // Allocate memory for each username only if not already allocated
+    FlipSocialModel *explore = malloc(sizeof(FlipSocialModel));
+    if (explore == NULL)
+    {
+        FURI_LOG_E(TAG, "Failed to allocate memory for explore model.");
+        return NULL;
+    }
+    return explore;
+}
+
 void auth_headers_alloc(void)
 {
     if (!app_instance)

alloc/alloc.h

@@ -3,6 +3,10 @@
 #include <callback/callback.h>
 #include <free/free.h>
 FlipSocialApp *flip_social_app_alloc();
+FlipSocialModel *alloc_friends_model();
+FlipSocialModel2 *alloc_messages();
+FlipSocialMessage *alloc_user_messages();
+FlipSocialModel *alloc_explore();
 void auth_headers_alloc(void);
 FlipSocialFeedMini *flip_feed_info_alloc(void);
 bool messages_dialog_alloc(bool free_first);

explore/flip_social_explore.c

@@ -1,17 +1,5 @@
 #include "flip_social_explore.h"
 
-FlipSocialModel *flip_social_explore_alloc(void)
-{
-    // Allocate memory for each username only if not already allocated
-    FlipSocialModel *explore = malloc(sizeof(FlipSocialModel));
-    if (explore == NULL)
-    {
-        FURI_LOG_E(TAG, "Failed to allocate memory for explore model.");
-        return NULL;
-    }
-    return explore;
-}
-
 // for now we're just listing the current users
 // as the feed is upgraded, then we can port more to the explore view
 bool flip_social_get_explore(FlipperHTTP *fhttp)
@@ -105,7 +93,7 @@ bool flip_social_parse_json_explore(FlipperHTTP *fhttp)
     }
 
     // Allocate memory for each username only if not already allocated
-    flip_social_explore = flip_social_explore_alloc();
+    flip_social_explore = alloc_explore();
     if (flip_social_explore == NULL)
     {
         FURI_LOG_E(TAG, "Failed to allocate memory for explore usernames.");

explore/flip_social_explore.h

@@ -2,7 +2,6 @@
 #define FLIP_SOCIAL_EXPLORE_H
 #include "flip_social.h"
 #include <callback/callback.h>
-FlipSocialModel *flip_social_explore_alloc();
 bool flip_social_get_explore(FlipperHTTP *fhttp);
 bool flip_social_get_explore_2(FlipperHTTP *fhttp);
 bool flip_social_parse_json_explore(FlipperHTTP *fhttp);

friends/flip_social_friends.c

@@ -1,17 +1,5 @@
 #include "flip_social_friends.h"
 
-FlipSocialModel *flip_social_friends_alloc()
-{
-    // Allocate memory for each username only if not already allocated
-    FlipSocialModel *friends = malloc(sizeof(FlipSocialModel));
-    if (friends == NULL)
-    {
-        FURI_LOG_E(TAG, "Failed to allocate memory for friends usernames.");
-        return NULL;
-    }
-    return friends;
-}
-
 // for now we're just listing the current users
 // as the feed is upgraded, then we can port more to the friends view
 bool flip_social_get_friends(FlipperHTTP *fhttp)
@@ -92,7 +80,7 @@ bool flip_social_parse_json_friends(FlipperHTTP *fhttp)
     }
 
     //  Allocate memory for each username only if not already allocated
-    flip_social_friends = flip_social_friends_alloc();
+    flip_social_friends = alloc_friends_model();
     if (flip_social_friends == NULL)
     {
         FURI_LOG_E(TAG, "Failed to allocate memory for friends usernames.");

friends/flip_social_friends.h

@@ -3,7 +3,6 @@
 #include "flip_social.h"
 #include <callback/callback.h>
 
-FlipSocialModel *flip_social_friends_alloc();
 bool flip_social_get_friends(FlipperHTTP *fhttp);
 bool flip_social_update_friends();
 bool flip_social_parse_json_friends(FlipperHTTP *fhttp);

messages/flip_social_messages.c

@@ -1,29 +1,5 @@
 #include "flip_social_messages.h"
 
-FlipSocialModel2 *flip_social_messages_alloc()
-{
-    // Allocate memory for each username only if not already allocated
-    FlipSocialModel2 *users = malloc(sizeof(FlipSocialModel2));
-    if (users == NULL)
-    {
-        FURI_LOG_E(TAG, "Failed to allocate memory for message users");
-        return NULL;
-    }
-    return users;
-}
-
-FlipSocialMessage *flip_social_user_messages_alloc()
-{
-    // Allocate memory for each username only if not already allocated
-    FlipSocialMessage *messages = malloc(sizeof(FlipSocialMessage));
-    if (messages == NULL)
-    {
-        FURI_LOG_E(TAG, "Failed to allocate memory for messages");
-        return NULL;
-    }
-    return messages;
-}
-
 bool flip_social_update_messages_submenu()
 {
     if (!app_instance)
@@ -187,7 +163,7 @@ bool flip_social_parse_json_message_users(FlipperHTTP *fhttp)
     }
 
     // Allocate memory for each username only if not already allocated
-    flip_social_message_users = flip_social_messages_alloc();
+    flip_social_message_users = alloc_messages();
     if (flip_social_message_users == NULL)
     {
         FURI_LOG_E(TAG, "Failed to allocate memory for message users.");
@@ -236,7 +212,7 @@ bool flip_social_parse_json_message_user_choices(FlipperHTTP *fhttp)
     }
 
     // Allocate memory for each username only if not already allocated
-    flip_social_explore = flip_social_explore_alloc();
+    flip_social_explore = alloc_explore();
     if (flip_social_explore == NULL)
     {
         FURI_LOG_E(TAG, "Failed to allocate memory for explore usernames.");
@@ -285,7 +261,7 @@ bool flip_social_parse_json_messages(FlipperHTTP *fhttp)
     }
 
     // Allocate memory for each message only if not already allocated
-    flip_social_messages = flip_social_user_messages_alloc();
+    flip_social_messages = alloc_user_messages();
     if (!flip_social_messages)
     {
         FURI_LOG_E(TAG, "Failed to allocate memory for messages.");

messages/flip_social_messages.h

@@ -5,9 +5,6 @@
 #include <callback/callback.h>
 #include <explore/flip_social_explore.h>
 
-FlipSocialModel2 *flip_social_messages_alloc();
-FlipSocialMessage *flip_social_user_messages_alloc();
-
 bool flip_social_update_messages_submenu();
 bool flip_social_update_submenu_user_choices();
 // Get all the users that have sent messages to the logged in user