X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fcommon.h;h=8c74579b525ff1c38c751a3241d6c8e99dcbc4e5;hb=520cdc8260ea033f1c9f54b87d93fcb034ae8472;hp=ca1b1399a6144e3579ad421fc37e23705b3ccdd1;hpb=770538dd64bcd8f258cb059c438f845533900a27;p=babeltrace.git

diff --git a/src/common/common.h b/src/common/common.h
index ca1b1399..8c74579b 100644
--- a/src/common/common.h
+++ b/src/common/common.h
@@ -32,16 +32,12 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <string.h>
 
-#include <babeltrace2/trace-ir/event-class-const.h>
-#include <babeltrace2/trace-ir/field-class-const.h>
-#include <babeltrace2/trace-ir/field-path-const.h>
-#include <babeltrace2/logging.h>
-#include <babeltrace2/value.h>
+#include <babeltrace2/babeltrace.h>
 
-#define __BT_FUNC_STATUS_ENABLE
+#define __BT_IN_BABELTRACE_H
 #include <babeltrace2/func-status.h>
-#undef __BT_FUNC_STATUS_ENABLE
 
 #include "common/assert.h"
 #include "common/macros.h"
@@ -429,8 +425,12 @@ const char *bt_common_field_class_type_string(enum bt_field_class_type class_typ
 		return "BT_FIELD_CLASS_TYPE_STATIC_ARRAY";
 	case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY:
 		return "BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY";
-	case BT_FIELD_CLASS_TYPE_VARIANT:
-		return "BT_FIELD_CLASS_TYPE_VARIANT";
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR:
+		return "BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR";
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR:
+		return "BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR";
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR:
+		return "BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR";
 	default:
 		return "(unknown)";
 	}
@@ -601,16 +601,12 @@ static inline
 const char *bt_common_func_status_string(int status)
 {
 	switch (status) {
-	case __BT_FUNC_STATUS_OVERFLOW:
+	case __BT_FUNC_STATUS_OVERFLOW_ERROR:
 		return "OVERFLOW";
-	case __BT_FUNC_STATUS_INVALID_PARAMS:
-		return "INVALID_PARAMS";
 	case __BT_FUNC_STATUS_INVALID_OBJECT:
 		return "INVALID_OBJECT";
 	case __BT_FUNC_STATUS_MEMORY_ERROR:
 		return "MEMORY_ERROR";
-	case __BT_FUNC_STATUS_LOADING_ERROR:
-		return "LOADING_ERROR";
 	case __BT_FUNC_STATUS_ERROR:
 		return "ERROR";
 	case __BT_FUNC_STATUS_OK:
@@ -621,10 +617,8 @@ const char *bt_common_func_status_string(int status)
 		return "NOT_FOUND";
 	case __BT_FUNC_STATUS_AGAIN:
 		return "AGAIN";
-	case __BT_FUNC_STATUS_UNSUPPORTED:
-		return "UNSUPPORTED";
-	case __BT_FUNC_STATUS_CANCELED:
-		return "CANCELED";
+	case __BT_FUNC_STATUS_INTERRUPTED:
+		return "INTERRUPTED";
 	default:
 		return "(unknown)";
 	}
@@ -721,6 +715,50 @@ end:
 	return ret;
 }
 
-#include <babeltrace2/undef-func-status.h>
+/*
+ * bt_g_string_append_printf cannot be inlined because it expects a
+ * variadic argument list.
+ */
+BT_HIDDEN
+int bt_common_g_string_append_printf(GString *str, const char *fmt, ...);
+
+static inline
+void bt_common_g_string_append(GString *str, const char *s)
+{
+	gsize len, allocated_len, s_len;
+
+	/* str->len excludes \0. */
+	len = str->len;
+	/* Exclude \0. */
+	allocated_len = str->allocated_len - 1;
+	s_len = strlen(s);
+	if (G_UNLIKELY(allocated_len < len + s_len)) {
+		/* Resize. */
+		g_string_set_size(str, len + s_len);
+	} else {
+		str->len = len + s_len;
+	}
+	memcpy(str->str + len, s, s_len + 1);
+}
+
+static inline
+void bt_common_g_string_append_c(GString *str, char c)
+{
+	gsize len, allocated_len, s_len;
+
+	/* str->len excludes \0. */
+	len = str->len;
+	/* Exclude \0. */
+	allocated_len = str->allocated_len - 1;
+	s_len = 1;
+	if (G_UNLIKELY(allocated_len < len + s_len)) {
+		/* Resize. */
+		g_string_set_size(str, len + s_len);
+	} else {
+		str->len = len + s_len;
+	}
+	str->str[len] = c;
+	str->str[len + 1] = '\0';
+}
 
 #endif /* BABELTRACE_COMMON_INTERNAL_H */