Maintenance: Remove snprintf wrappers (#623)

Remove wrappers that were originally part of a C90 workaround and
are no longer needed now that C99 is required

src/sundials/sundials_logger.c

@@ -58,11 +58,11 @@ void sunCreateLogMessage(SUNLogLevel lvl, int rank, const char* scope,
   else if (lvl == SUN_LOGLEVEL_INFO) { prefix = "INFO"; }
   else if (lvl == SUN_LOGLEVEL_ERROR) { prefix = "ERROR"; }
 
-  msg_length = sunsnprintf(NULL, 0, "[%s][rank %d][%s][%s] %s\n", prefix, rank,
-                           scope, label, formatted_txt);
+  msg_length = snprintf(NULL, 0, "[%s][rank %d][%s][%s] %s\n", prefix, rank,
+                        scope, label, formatted_txt);
   *log_msg   = (char*)malloc(msg_length + 1);
-  sunsnprintf(*log_msg, msg_length + 1, "[%s][rank %d][%s][%s] %s\n", prefix,
-              rank, scope, label, formatted_txt);
+  snprintf(*log_msg, msg_length + 1, "[%s][rank %d][%s][%s] %s\n", prefix, rank,
+           scope, label, formatted_txt);
   free(formatted_txt);
 }
 

src/sundials/sundials_utils.h

@@ -32,27 +32,6 @@ static inline char* sunCombineFileAndLine(int line, const char* file)
   return file_and_line;
 }
 
-static inline int sunvsnprintf(char* buffer, size_t bufsz, const char* format,
-                               va_list vlist)
-{
-  int size = 0;
-  va_list tmp;
-  va_copy(tmp, vlist);
-  size = vsnprintf(buffer, bufsz, format, tmp);
-  va_end(tmp);
-  return size;
-}
-
-static inline int sunsnprintf(char* buffer, size_t bufsz, const char* format, ...)
-{
-  int size = 0;
-  va_list args;
-  va_start(args, format);
-  size = sunvsnprintf(buffer, bufsz, format, args);
-  va_end(args);
-  return size;
-}
-
 /*
  * Implementation of the GNU extension function vasprintf which
  * is itself an analog for vsprintf, except it allocates a string
@@ -63,15 +42,21 @@ static inline int sunvasnprintf(char** str, const char* fmt, va_list args)
   int size = 0;
 
   /* compute string length */
-  size = sunvsnprintf(NULL, 0, fmt, args);
+  va_list tmp1;
+  va_copy(tmp1, args);
+  size = vsnprintf(NULL, 0, fmt, tmp1);
+  va_end(tmp1);
 
   if (size < 0) { return -1; }
 
   /* add one to size for the null terminator*/
   *str = (char*)malloc(size + 1);
   if (NULL == *str) { return -1; }
 
-  size = vsnprintf(*str, size + 1, fmt, args);
+  va_list tmp2;
+  va_copy(tmp2, args);
+  size = vsnprintf(*str, size + 1, fmt, tmp2);
+  va_end(tmp2);
 
   return size;
 }