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 1abe37ec11b094bf80713ad212a462f6e6f32f93..19f4c128443acafbac5b0efe1bd8f6dd42d61539 100644 (file)
--- a/src/common/common.h
+++ b/src/common/common.h
@@ -1,29 +1,13 @@
-#ifndef BABELTRACE_COMMON_INTERNAL_H
-#define BABELTRACE_COMMON_INTERNAL_H
-
 /*
+ * SPDX-License-Identifier: MIT
+ *
  * Copyright (c) 2018 EfficiOS Inc. and Linux Foundation
  * Copyright (c) 2018 Philippe Proulx <pproulx@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
  */
 
+#ifndef BABELTRACE_COMMON_INTERNAL_H
+#define BABELTRACE_COMMON_INTERNAL_H
+
 #include <errno.h>
 #include <glib.h>
 #include <inttypes.h>
@@ -44,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"
@@ -454,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
@@ -865,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 */