cLib: Make the log function easier

Using variable list arguments in c is a pain.

gj_common/gitjournal.c

@@ -9,6 +9,16 @@
 
 #define GJ_ERR_EMPTY_COMMIT -954
 
+void gj_log_internal(const char *format, ...)
+{
+    char buffer[1024];
+    va_list args;
+    va_start(args, format);
+    vsprintf(buffer, format, args);
+    gj_log(buffer);
+    va_end(args);
+}
+
 gj_error *gj_error_info(int err)
 {
     if (err == 0)
@@ -49,7 +59,7 @@ void gj_error_free(const gj_error *err)
 
 int match_cb(const char *path, const char *spec, void *payload)
 {
-    gj_log("Match: %s\n", path);
+    gj_log_internal("Match: %s\n", path);
     return 0;
 }
 
@@ -90,7 +100,7 @@ int rm_match_cb(const char *path, const char *spec, void *payload)
     char *git_base_path = (char *)payload;
     if (!git_base_path)
     {
-        gj_log("git_base_path not in payload. Why?\n");
+        gj_log_internal("git_base_path not in payload. Why?\n");
         return 1;
     }
 
@@ -103,10 +113,10 @@ int rm_match_cb(const char *path, const char *spec, void *payload)
     int err = remove(full_path);
     if (err != 0)
     {
-        gj_log("File could not be deleted: %s %d\n", full_path, errno);
+        gj_log_internal("File could not be deleted: %s %d\n", full_path, errno);
         if (errno == ENOENT)
         {
-            gj_log("ENOENT\n");
+            gj_log_internal("ENOENT\n");
         }
     }
 
@@ -274,12 +284,12 @@ int fetch_progress(const git_transfer_progress *stats, void *payload)
         stats->total_objects;
     int kbytes = stats->received_bytes / 1024;
 
-    gj_log("network %3d%% (%4d kb, %5d/%5d)  /"
+    gj_log_internal("network %3d%% (%4d kb, %5d/%5d)  /"
-           "  index %3d%% (%5d/%5d)\n",
+                    "  index %3d%% (%5d/%5d)\n",
-           fetch_percent, kbytes,
+                    fetch_percent, kbytes,
-           stats->received_objects, stats->total_objects,
+                    stats->received_objects, stats->total_objects,
-           index_percent,
+                    index_percent,
-           stats->indexed_objects, stats->total_objects);
+                    stats->indexed_objects, stats->total_objects);
     return 0;
 }
 
@@ -304,27 +314,27 @@ int credentials_cb(git_cred **out, const char *url, const char *username_from_ur
 {
     if (!payload)
     {
-        gj_log("credentials_cb has no payload\n");
+        gj_log_internal("credentials_cb has no payload\n");
         return -1;
     }
     gj_credentials_payload *gj_payload = (gj_credentials_payload *)payload;
     if (!gj_payload->first_time)
     {
-        gj_log("GitJournal: Credentials have been tried and they failed\n");
+        gj_log_internal("GitJournal: Credentials have been tried and they failed\n");
         return -1;
     }
 
-    gj_log("UsernameProvided: %s\n", username_from_url);
+    gj_log_internal("UsernameProvided: %s\n", username_from_url);
-    gj_log("Allowed Types: %d\n", allowed_types);
+    gj_log_internal("Allowed Types: %d\n", allowed_types);
-    gj_log("Payload: %p\n", payload);
+    gj_log_internal("Payload: %p\n", payload);
 
     if (!(allowed_types & GIT_CREDTYPE_SSH_KEY))
     {
-        gj_log("Some other auth mechanism is being used: %d\n", allowed_types);
+        gj_log_internal("Some other auth mechanism is being used: %d\n", allowed_types);
         return -1;
     }
 
-    gj_log("gj_paylaod: %p\n", gj_payload);
+    gj_log_internal("gj_paylaod: %p\n", gj_payload);
     gj_payload->first_time = false;
     return git_cred_ssh_key_new(out, username_from_url,
                                 g_public_key_path, g_private_key_path, g_passcode);
@@ -332,17 +342,17 @@ int credentials_cb(git_cred **out, const char *url, const char *username_from_ur
 
 int certificate_check_cb(git_cert *cert, int valid, const char *host, void *payload)
 {
-    gj_log("Valid: %d\n", valid);
+    gj_log_internal("Valid: %d\n", valid);
-    gj_log("CertType: %d\n", cert->cert_type);
+    gj_log_internal("CertType: %d\n", cert->cert_type);
 
     if (valid == 0)
     {
-        gj_log("%s: Invalid certificate\n", host);
+        gj_log_internal("%s: Invalid certificate\n", host);
     }
 
     if (cert->cert_type == GIT_CERT_HOSTKEY_LIBSSH2)
     {
-        gj_log("LibSSH2 Key: %p\n", payload);
+        gj_log_internal("LibSSH2 Key: %p\n", payload);
         return 0;
     }
     return -1;
@@ -472,7 +482,7 @@ int gj_git_pull(char *git_base_path, char *author_name, char *author_email)
 
         if (err == GIT_ITEROVER)
         {
-            gj_log("    No Conflicts\n");
+            gj_log_internal("    No Conflicts\n");
             break;
         }
         if (err < 0)

gj_common/gitjournal.h

@@ -30,6 +30,6 @@ gj_error *gj_error_info(int err);
 void gj_error_free(const gj_error *err);
 
 // This must be implemented by you
-void gj_log(const char *format, ...);
+void gj_log(const char *message);
 
 #endif

gj_common/test.c

@@ -17,12 +17,9 @@ int handle_error(int err)
     return err;
 }
 
-void gj_log(const char *format, ...)
+void gj_log(const char *message)
 {
-    va_list args;
+    printf(message);
-    va_start(args, format);
-    vprintf(format, args);
-    va_end(args);
 }
 
 int main(int argc, char *argv[])