common: move bt_component_class_type_string here, use it more

[babeltrace.git] / src / common / common.h

diff --git a/src/common/common.h b/src/common/common.h
index a04f2be64cd4747939c9254b7c26c340b1dfdb4d..19f4c128443acafbac5b0efe1bd8f6dd42d61539 100644 (file)
--- a/src/common/common.h
+++ b/src/common/common.h
@@ -28,6 +28,10 @@
 #include "common/macros.h"
 #include "common/safe.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define BT_COMMON_COLOR_RESET                  "\033[0m"
 #define BT_COMMON_COLOR_BOLD                   "\033[1m"
 #define BT_COMMON_COLOR_FG_DEFAULT             "\033[39m"
@@ -438,7 +442,7 @@ ssize_t bt_common_read(int fd, void *buf, size_t count, int log_level)
        BT_ASSERT_DBG(count <= SSIZE_MAX);
 
        do {
-               ret = read(fd, buf + i, count - i);
+               ret = read(fd, ((char *) buf) + i, count - i);
                if (ret < 0) {
                        if (errno == EINTR) {
 #ifdef BT_LOG_WRITE_CUR_LVL
@@ -849,4 +853,24 @@ void bt_common_g_string_append_c(GString *str, char c)
        str->str[len + 1] = '\0';
 }
 
+static inline
+const char *bt_common_component_class_type_string(
+               enum bt_component_class_type type)
+{
+       switch (type) {
+       case BT_COMPONENT_CLASS_TYPE_SOURCE:
+               return "SOURCE";
+       case BT_COMPONENT_CLASS_TYPE_SINK:
+               return "SINK";
+       case BT_COMPONENT_CLASS_TYPE_FILTER:
+               return "FILTER";
+       default:
+               return "(unknown)";
+       }
+}
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* BABELTRACE_COMMON_INTERNAL_H */