sol-buffer: add sol_buffer_insert_printf()

Gustavo Sverzut Barbieri · Gustavo Sverzut Barbieri · commit 07838f37fdc9 · 2015-08-14T11:46:22.000-03:00
Allows inserting a formatted string at a given position.

Signed-off-by: Gustavo Sverzut Barbieri gustavo.barbieri@intel.com
diff --git a/src/lib/datatypes/include/sol-buffer.h b/src/lib/datatypes/include/sol-buffer.h
@@ -212,6 +212,24 @@ sol_buffer_append_printf(struct sol_buffer *buf, const char *fmt, ...)
     return r;
 }
 
+/* insert the formatted string into the buffer at given position.  If
+ * position == buf->pos, then the behavior is the same as
+ * sol_buffer_append_vprintf().
+ */
+int sol_buffer_insert_vprintf(struct sol_buffer *buf, size_t pos, const char *fmt, va_list args);
+static inline int sol_buffer_insert_printf(struct sol_buffer *buf, size_t pos, const char *fmt, ...) SOL_ATTR_PRINTF(3, 4);
+static inline int
+sol_buffer_insert_printf(struct sol_buffer *buf, size_t pos, const char *fmt, ...)
+{
+    va_list args;
+    int r;
+
+    va_start(args, fmt);
+    r = sol_buffer_insert_vprintf(buf, pos, fmt, args);
+    va_end(args);
+    return r;
+}
+
 /**
  * @}
  */
diff --git a/src/lib/datatypes/sol-buffer.c b/src/lib/datatypes/sol-buffer.c
@@ -214,3 +214,28 @@ sol_buffer_append_vprintf(struct sol_buffer *buf, const char *fmt, va_list args)
     va_end(args_copy);
     return r;
 }
+
+SOL_API int
+sol_buffer_insert_vprintf(struct sol_buffer *buf, size_t pos, const char *fmt, va_list args)
+{
+    char *s;
+    ssize_t len;
+    struct sol_str_slice slice;
+    int r;
+
+    SOL_NULL_CHECK(buf, -EINVAL);
+    SOL_NULL_CHECK(fmt, -EINVAL);
+    SOL_INT_CHECK(pos, > buf->used, -EINVAL);
+
+    if (pos == buf->used)
+        return sol_buffer_append_vprintf(buf, fmt, args);
+
+    len = vasprintf(&s, fmt, args);
+    if (len < 0)
+        return -errno;
+
+    slice = SOL_STR_SLICE_STR(s, len);
+    r = sol_buffer_insert_slice(buf, pos, slice);
+    free(s);
+    return r;
+}
diff --git a/src/test/test-buffer.c b/src/test/test-buffer.c
@@ -241,6 +241,30 @@ test_append_printf(void)
     sol_buffer_fini(&buf);
 }
 
+DEFINE_TEST(test_insert_printf);
+
+static void
+test_insert_printf(void)
+{
+    struct sol_buffer buf;
+    int err;
+
+    sol_buffer_init(&buf);
+    err = sol_buffer_insert_printf(&buf, 0, "'%s'", "This is a longer string, bla bla bla, bla bla bla");
+    ASSERT_INT_EQ(err, 0);
+    ASSERT_STR_EQ(buf.data, "'This is a longer string, bla bla bla, bla bla bla'");
+
+    err = sol_buffer_insert_printf(&buf, 0, "[%03d]", 1);
+    ASSERT_INT_EQ(err, 0);
+    ASSERT_STR_EQ(buf.data, "[001]'This is a longer string, bla bla bla, bla bla bla'");
+
+    err = sol_buffer_insert_printf(&buf, strlen("[001]"), " ### ");
+    ASSERT_INT_EQ(err, 0);
+    ASSERT_STR_EQ(buf.data, "[001] ### 'This is a longer string, bla bla bla, bla bla bla'");
+
+    sol_buffer_fini(&buf);
+}
+
 DEFINE_TEST(test_memory_not_owned);
 
 static void
