Fix conflict from remove of ssnprintf2 and align utils/common/common.h

diff --combined src/utils/common/common.c
index 2711c9d,6a0ac28..aad767e
--- 1/src/utils/common/common.c
--- 2/src/utils/common/common.c
+++ b/src/utils/common/common.c
@@@ -89,7 -89,8 +89,7 @@@ char *sstrncpy(char *dest, const char *
    return dest;
  } /* char *sstrncpy */
  
 -/* ssnprintf returns zero on success, one if truncation occurred
 -   and a negative integer onerror. */
 +/* ssnprintf returns result from vsnprintf conistent with snprintf */
  int ssnprintf(char *str, size_t sz, const char *format, ...) {
    va_list ap;
    va_start(ap, format);
@@@ -101,22 -102,6 +101,6 @@@
    return ret;
  } /* int ssnprintf */
  
- /* ssnprintf2 returns zero on success, one if truncation occurred
-    and a negative integer on error. */
- int ssnprintf2(char *str, size_t sz, const char *format, ...) {
-   va_list ap;
-   va_start(ap, format);
- 
-   int ret = vsnprintf(str, sz, format, ap);
- 
-   va_end(ap);
- 
-   if (ret < 0) {
-     return ret;
-   }
-   return (size_t)ret >= sz;
- } /* int ssnprintf2 */
- 
  char *ssnprintf_alloc(char const *format, ...) /* {{{ */
  {
    char static_buffer[1024] = "";