Merge pull request #3342 from zebity/master

[collectd.git] / src / utils / common / common.c

diff --git a/src/utils/common/common.c b/src/utils/common/common.c
index 2711c9d..2cebc0d 100644 (file)
--- a/src/utils/common/common.c
+++ b/src/utils/common/common.c
@@ -101,22 +101,6 @@ int ssnprintf(char *str, size_t sz, const char *format, ...) {
   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] = "";
@@ -1279,7 +1263,7 @@ int walk_directory(const char *dir, dirwalk_callback_f callback,
   return 0;
 }
 
-ssize_t read_file_contents(const char *filename, char *buf, size_t bufsize) {
+ssize_t read_file_contents(const char *filename, void *buf, size_t bufsize) {
   FILE *fh;
   ssize_t ret;
 
@@ -1297,6 +1281,16 @@ ssize_t read_file_contents(const char *filename, char *buf, size_t bufsize) {
   return ret;
 }
 
+ssize_t read_text_file_contents(const char *filename, char *buf,
+                                size_t bufsize) {
+  ssize_t ret = read_file_contents(filename, buf, bufsize - 1);
+  if (ret < 0)
+    return ret;
+
+  buf[ret] = '\0';
+  return ret + 1;
+}
+
 counter_t counter_diff(counter_t old_value, counter_t new_value) {
   counter_t diff;