Change: split handle_get_tasks into multiple functions

src/gmp_base.c

@@ -125,12 +125,48 @@ buffer_xml_append_printf (GString *buffer, const char *format, ...)
  * @return TRUE if send to client failed, else FALSE.
  */
 gboolean
-send_to_client (const char* msg,
-                int (*user_send_to_client) (const char*, void*),
-                void* user_send_to_client_data)
+send_to_client (gmp_parser_t *parser, GError** error, const char* msg)
 {
-  if (user_send_to_client && msg)
-    return user_send_to_client (msg, user_send_to_client_data);
+  if (parser
+      && parser->client_writer
+      && msg
+      && parser->client_writer (msg, parser->client_writer_data))
+    {
+      error_send_to_client (error);
+      return TRUE;
+    }
+  return FALSE;
+}
+
+/**
+ * @brief Send a response message to the client.
+ *
+ * @param[in]  gmp_parser   GMP parser.
+ * @param[in]  error        Error.
+ * @param[in]  format       Format string.
+ *
+ * @return TRUE if error, else FALSE.
+ */
+gboolean
+sendf_to_client (gmp_parser_t *parser, GError **error, const char *format, ...)
+{
+  if (format)
+    {
+      va_list args;
+      gchar *msg;
+
+      va_start (args, format);
+      msg = g_markup_vprintf_escaped (format, args);
+      va_end (args);
+
+      if (parser->client_writer (msg, parser->client_writer_data))
+        {
+          g_free (msg);
+          error_send_to_client (error);
+          return TRUE;
+        }
+      g_free (msg);
+    }
   return FALSE;
 }
 
@@ -141,12 +177,14 @@ send_to_client (const char* msg,
  * @param[in]  type         Resource type.
  * @param[in]  id           Resource ID.
  * @param[in]  gmp_parser   GMP Parser.
+ * @param[in]  error        Error.
  *
  * @return TRUE if out of space in to_client, else FALSE.
  */
 gboolean
-send_find_error_to_client (const char* command, const char* type,
-                           const char* id, gmp_parser_t *gmp_parser)
+send_find_error_to_client (const char *command, const char *type,
+                           const char *id, gmp_parser_t *gmp_parser,
+                           GError **error)
 {
   gchar *msg;
   gboolean ret;
@@ -155,8 +193,7 @@ send_find_error_to_client (const char* command, const char* type,
                                  STATUS_ERROR_MISSING
                                  "\" status_text=\"Failed to find %s '%s'\"/>",
                                  command, type, id);
-  ret = send_to_client (msg, gmp_parser->client_writer,
-                        gmp_parser->client_writer_data);
+  ret = send_to_client (gmp_parser, error, msg);
   g_free (msg);
   return ret;
 }

src/gmp_base.h

@@ -44,11 +44,14 @@ void
 buffer_xml_append_printf (GString *, const char *, ...);
 
 gboolean
-send_to_client (const char *, int (*) (const char *, void *), void *);
+send_to_client (gmp_parser_t *, GError **, const char *);
+
+gboolean
+sendf_to_client (gmp_parser_t *, GError **, const char *, ...);
 
 gboolean
 send_find_error_to_client (const char *, const char *, const char *,
-                           gmp_parser_t *);
+                           gmp_parser_t *, GError **);
 
 void
 error_send_to_client (GError **);
@@ -70,11 +73,9 @@ internal_error_send_to_client (GError **);
   do                                                                  \
     {                                                                 \
       gchar *msg = g_markup_printf_escaped (format, ##args);          \
-      if (send_to_client (msg, gmp_parser->client_writer,             \
-                          gmp_parser->client_writer_data))            \
+      if (send_to_client (gmp_parser, error, msg))                    \
         {                                                             \
           g_free (msg);                                               \
-          error_send_to_client (error);                               \
           return err_ret;                                             \
         }                                                             \
       g_free (msg);                                                   \
@@ -94,11 +95,9 @@ internal_error_send_to_client (GError **);
   do                                                         \
     {                                                        \
       gchar *msg = g_markup_printf_escaped (format, ##args); \
-      if (send_to_client (msg, gmp_parser->client_writer,    \
-                          gmp_parser->client_writer_data))   \
+      if (send_to_client (gmp_parser, error, msg))           \
         {                                                    \
           g_free (msg);                                      \
-          error_send_to_client (error);                      \
           return;                                            \
         }                                                    \
       g_free (msg);                                          \
@@ -113,16 +112,12 @@ internal_error_send_to_client (GError **);
  *
  * @param[in]   msg    The message, a string.
  */
-#define SEND_TO_CLIENT_OR_FAIL(msg)                        \
-  do                                                       \
-    {                                                      \
-      if (send_to_client (msg, gmp_parser->client_writer,  \
-                          gmp_parser->client_writer_data)) \
-        {                                                  \
-          error_send_to_client (error);                    \
-          return;                                          \
-        }                                                  \
-    }                                                      \
+#define SEND_TO_CLIENT_OR_FAIL(msg)                \
+  do                                               \
+    {                                              \
+      if (send_to_client (gmp_parser, error, msg)) \
+        return;                                    \
+    }                                              \
   while (0)
 
 void

src/gmp_configs.c

@@ -572,11 +572,8 @@ create_config_run (gmp_parser_t *gmp_parser, GError **error)
           case 2:
             if (send_find_error_to_client ("create_config", "config",
                                            entity_text (copy),
-                                           gmp_parser))
-              {
-                error_send_to_client (error);
-                return;
-              }
+                                           gmp_parser, error))
+              return;
             log_event_fail ("config", "Config", NULL, "created");
             break;
           case 99:
@@ -1042,11 +1039,9 @@ modify_config_run (gmp_parser_t *gmp_parser, GError **error)
         if (send_find_error_to_client ("modify_config",
                                        "config",
                                        config_id,
-                                       gmp_parser))
-          {
-            error_send_to_client (error);
-            return;
-          }
+                                       gmp_parser,
+                                       error))
+          return;
         log_event_fail ("config", "Scan Config", config_id, "modified");
         return;
       default:

src/gmp_delete.c

@@ -139,11 +139,8 @@ delete_run (gmp_parser_t *gmp_parser, GError **error)
         break;
       case 2:
         if (send_find_error_to_client
-             (delete.command, delete.type, delete.id, gmp_parser))
-          {
-            error_send_to_client (error);
-            return;
-          }
+             (delete.command, delete.type, delete.id, gmp_parser, error))
+          return;
         log_event_fail (delete.type, delete.type_capital,
                         delete.id,
                         "deleted");

src/gmp_get.c

@@ -261,15 +261,14 @@ get_next (iterator_t *resources, get_data_t *get, int *first, int *count,
 /**
  * @brief Send start of GET response.
  *
+ * @param[in]  gmp_parser            GMP Parser.
+ * @param[in]  error                 Error.
  * @param[in]  type                  Type.
- * @param[in]  write_to_client       Function that sends to clients.
- * @param[in]  write_to_client_data  Data for write_to_client.
  *
  * @return 0 success, 1 send to client failed.
  */
 int
-send_get_start (const char *type, int (*write_to_client) (const char*, void*),
-                void* write_to_client_data)
+send_get_start (gmp_parser_t *gmp_parser, GError **error, const char *type)
 {
   gchar *msg;
 
@@ -285,7 +284,7 @@ send_get_start (const char *type, int (*write_to_client) (const char*, void*),
                                    type);
 
 
-  if (send_to_client (msg, write_to_client, write_to_client_data))
+  if (send_to_client (gmp_parser, error, msg))
     {
       g_free (msg);
       return 1;
@@ -309,8 +308,8 @@ send_get_start (const char *type, int (*write_to_client) (const char*, void*),
  */
 int
 send_get_common (const char *type, get_data_t *get, iterator_t *iterator,
-                 int (*write_to_client) (const char *, void*),
-                 void* write_to_client_data, int writable, int in_use)
+                 gmp_parser_t *gmp_parser, GError **error, int writable,
+                 int in_use)
 {
   GString *buffer;
   const char *tag_type;
@@ -453,7 +452,7 @@ send_get_common (const char *type, get_data_t *get, iterator_t *iterator,
         }
     }
 
-  if (send_to_client (buffer->str, write_to_client, write_to_client_data))
+  if (send_to_client (gmp_parser, error, buffer->str))
     {
       g_string_free (buffer, TRUE);
       return 1;
@@ -550,17 +549,16 @@ buffer_get_filter_xml (GString *msg, const char* type,
  * @param[in]  count                 Page count.
  * @param[in]  filtered              Filtered count.
  * @param[in]  full                  Full count.
- * @param[in]  write_to_client       Function that sends to clients.
- * @param[in]  write_to_client_data  Data for write_to_client.
+ * @param[in]  gmp_parser            GMP Parser.
+ * @param[in]  error                 Error.
  *
  * @return 0 success, 1 sending to client failed, 2 failed to allocate filter
  *         term.
  */
 static int
 send_get_end_internal (const char *type, get_data_t *get, int get_counts,
                        int count, int filtered, int full,
-                       int (*write_to_client) (const char *, void*),
-                       void* write_to_client_data)
+                       gmp_parser_t *gmp_parser, GError **error)
 {
   gchar *sort_field, *filter;
   int first, max, sort_order;
@@ -685,7 +683,7 @@ send_get_end_internal (const char *type, get_data_t *get, int get_counts,
   g_free (sort_field);
   g_free (filter);
 
-  if (send_to_client (msg->str, write_to_client, write_to_client_data))
+  if (send_to_client (gmp_parser, error, msg->str))
     {
       g_string_free (msg, TRUE);
       return 1;
@@ -702,37 +700,34 @@ send_get_end_internal (const char *type, get_data_t *get, int get_counts,
  * @param[in]  count                 Page count.
  * @param[in]  filtered              Filtered count.
  * @param[in]  full                  Full count.
- * @param[in]  write_to_client       Function that sends to clients.
- * @param[in]  write_to_client_data  Data for write_to_client.
+ * @param[in]  gmp_parser            GMP Parser.
+ * @param[in]  error                 Error.
  *
  * @return 0 success, 1 sending to client failed, 2 failed to allocate filter
  *         term.
  */
 int
 send_get_end (const char *type, get_data_t *get, int count, int filtered,
-              int full, int (*write_to_client) (const char *, void*),
-              void* write_to_client_data)
+              int full, gmp_parser_t *gmp_parser, GError **error)
 {
   return send_get_end_internal (type, get, 1, count, filtered, full,
-                                write_to_client, write_to_client_data);
+                                gmp_parser, error);
 }
 
 /**
  * @brief Send end of GET response, skipping result counts.
  *
  * @param[in]  type                  Type.
  * @param[in]  get                   GET data.
- * @param[in]  write_to_client       Function that sends to clients.
- * @param[in]  write_to_client_data  Data for write_to_client.
+ * @param[in]  gmp_parser            GMP Parser.
+ * @param[in]  error                 Error.
  *
  * @return 0 success, 1 sending to client failed, 2 failed to allocate filter
  *         term.
  */
 int
 send_get_end_no_counts (const char *type, get_data_t *get,
-                        int (*write_to_client) (const char *, void*),
-                        void* write_to_client_data)
+                        gmp_parser_t *gmp_parser, GError **error)
 {
-  return send_get_end_internal (type, get, 0, 0, 0, 0, write_to_client,
-                                write_to_client_data);
+  return send_get_end_internal (type, get, 0, 0, 0, 0, gmp_parser, error);
 }