Allow varargs in log messages, use log_error in more places

Signed-off-by: Tushar Gohad <tushar.gohad@intel.com>

include/erasurecode/erasurecode_helpers.h

@@ -48,10 +48,10 @@
 #define _LOG2(level, ...) \
     syslog (level, "%s:%d:%s\n", __FILE__, __LINE__, __VA_ARGS__)
 
-#define log_info(str, ...)  _LOG1(LOG_INFO, str)
-#define log_warn(str, ...)  _LOG1(LOG_WARNING, str)
-#define log_error(str, ...) _LOG1(LOG_ERR, str)
-#define log_debug(str, ...) _LOG2(LOG_DEBUG, str)
+#define log_info(...)  _LOG1(LOG_INFO, __VA_ARGS__)
+#define log_warn(...)  _LOG1(LOG_WARNING, __VA_ARGS__)
+#define log_error(...) _LOG1(LOG_ERR, __VA_ARGS__)
+#define log_debug(...) _LOG2(LOG_DEBUG, __VA_ARGS__)
 
 /* ==~=*=~==~=*=~==~=*=~==~=*=~==~=*=~==~=*=~==~=*=~==~=*=~==~=*=~==~=*=~== */
 

src/erasurecode.c

@@ -37,7 +37,6 @@
 
 void __attribute__ ((constructor))
 liberasurecode_init(void) {
-    fprintf(stderr, "liberasurecode_init called\n");
     openlog("liberasurecode", LOG_PID | LOG_CONS, LOG_USER);
 }
 
@@ -169,9 +168,9 @@ static void print_dlerror(const char *caller)
 {
     char *msg = dlerror();
     if (NULL == msg)
-        fprintf (stderr, "%s: unknown dynamic linking error\n", caller);
+        log_error("%s: unknown dynamic linking error\n", caller);
     else
-        fprintf (stderr, "%s: dynamic linking error %s\n", caller, msg);
+        log_error("%s: dynamic linking error %s\n", caller, msg);
 }
 
 /* Generic dlopen/dlclose routines */

src/erasurecode_helpers.c

@@ -126,8 +126,7 @@ int free_fragment_buffer(char *buf)
 
     header = (fragment_header_t *) buf;
     if (header->magic != LIBERASURECODE_FRAG_HEADER_MAGIC) {
-        fprintf(stderr,
-            "Invalid fragment header (free fragment)!");
+        log_error("Invalid fragment header (free fragment)!");
         return -1;
     }
 
@@ -195,7 +194,7 @@ char *get_fragment_ptr_from_data(char *buf)
     header = (fragment_header_t *) buf;
 
     if (header->magic != LIBERASURECODE_FRAG_HEADER_MAGIC) {
-        fprintf(stderr, "Invalid fragment header (get header ptr)!\n");
+        log_error("Invalid fragment header (get header ptr)!\n");
         return NULL;
     }
 
@@ -209,7 +208,7 @@ int set_fragment_idx(char *buf, int idx)
     fragment_header_t *header = (fragment_header_t *) buf;
 
     if (header->magic != LIBERASURECODE_FRAG_HEADER_MAGIC) {
-        fprintf(stderr, "Invalid fragment header (idx check)!\n");
+        log_error("Invalid fragment header (idx check)!\n");
         return -1;
     }
 
@@ -223,7 +222,7 @@ int get_fragment_idx(char *buf)
     fragment_header_t *header = (fragment_header_t *) buf;
 
     if (header->magic != LIBERASURECODE_FRAG_HEADER_MAGIC) {
-        fprintf(stderr, "Invalid fragment header (get idx)!");
+        log_error("Invalid fragment header (get idx)!");
         return -1;
     }
 
@@ -235,7 +234,7 @@ int set_fragment_size(char *buf, int size)
     fragment_header_t *header = (fragment_header_t *) buf;
 
     if (header->magic != LIBERASURECODE_FRAG_HEADER_MAGIC) {
-        fprintf(stderr, "Invalid fragment header (size check)!");
+        log_error("Invalid fragment header (size check)!");
         return -1;
     }
 
@@ -249,7 +248,7 @@ int get_fragment_size(char *buf)
     fragment_header_t *header = (fragment_header_t *) buf;
 
     if (header->magic != LIBERASURECODE_FRAG_HEADER_MAGIC) {
-        fprintf(stderr, "Invalid fragment header (get size)!");
+        log_error("Invalid fragment header (get size)!");
         return -1;
     }
 
@@ -261,7 +260,7 @@ int set_orig_data_size(char *buf, int orig_data_size)
     fragment_header_t *header = (fragment_header_t *) buf;
 
     if (header->magic != LIBERASURECODE_FRAG_HEADER_MAGIC) {
-        fprintf(stderr, "Invalid fragment header (set orig data check)!");
+        log_error("Invalid fragment header (set orig data check)!");
         return -1;
     }
 
@@ -275,7 +274,7 @@ int get_orig_data_size(char *buf)
     fragment_header_t *header = (fragment_header_t *) buf;
 
     if (header->magic != LIBERASURECODE_FRAG_HEADER_MAGIC) {
-        fprintf(stderr, "Invalid fragment header (get orig data check)!");
+        log_error("Invalid fragment header (get orig data check)!");
         return -1;
     }