lib: make bt_value_map_foreach_entry_{const_}func() return a status code

[babeltrace.git] / src / lib / func-status.h

diff --git a/src/lib/func-status.h b/src/lib/func-status.h
index ed3dd0ccdc1aa217de35a376a4fdc939959048dc..b974f84fd7686b14f7d52523b4a75a9d5fb20021 100644 (file)
--- a/src/lib/func-status.h
+++ b/src/lib/func-status.h
@@ -23,27 +23,23 @@
  * SOFTWARE.
  */
 
-#define __BT_FUNC_STATUS_ENABLE
+#define __BT_IN_BABELTRACE_H
 #include <babeltrace2/func-status.h>
-#undef __BT_FUNC_STATUS_ENABLE
 
 /*
  * Aliases without a `__` prefix for internal code: this is just easier
  * to read.
  */
-#define BT_FUNC_STATUS_OVERFLOW                __BT_FUNC_STATUS_OVERFLOW
-#define BT_FUNC_STATUS_INVALID_PARAMS  __BT_FUNC_STATUS_INVALID_PARAMS
-#define BT_FUNC_STATUS_INVALID_OBJECT  __BT_FUNC_STATUS_INVALID_OBJECT
-#define BT_FUNC_STATUS_MEMORY_ERROR    __BT_FUNC_STATUS_MEMORY_ERROR
-#define BT_FUNC_STATUS_LOADING_ERROR   __BT_FUNC_STATUS_LOADING_ERROR
-#define BT_FUNC_STATUS_ERROR           __BT_FUNC_STATUS_ERROR
-#define BT_FUNC_STATUS_OK              __BT_FUNC_STATUS_OK
+#define BT_FUNC_STATUS_AGAIN           __BT_FUNC_STATUS_AGAIN
 #define BT_FUNC_STATUS_END             __BT_FUNC_STATUS_END
+#define BT_FUNC_STATUS_USER_ERROR      __BT_FUNC_STATUS_USER_ERROR
+#define BT_FUNC_STATUS_ERROR           __BT_FUNC_STATUS_ERROR
+#define BT_FUNC_STATUS_INTERRUPTED     __BT_FUNC_STATUS_INTERRUPTED
+#define BT_FUNC_STATUS_UNKNOWN_OBJECT  __BT_FUNC_STATUS_UNKNOWN_OBJECT
+#define BT_FUNC_STATUS_MEMORY_ERROR    __BT_FUNC_STATUS_MEMORY_ERROR
+#define BT_FUNC_STATUS_NO_MATCH                __BT_FUNC_STATUS_NO_MATCH
 #define BT_FUNC_STATUS_NOT_FOUND       __BT_FUNC_STATUS_NOT_FOUND
-#define BT_FUNC_STATUS_AGAIN           __BT_FUNC_STATUS_AGAIN
-#define BT_FUNC_STATUS_UNSUPPORTED     __BT_FUNC_STATUS_UNSUPPORTED
-#define BT_FUNC_STATUS_CANCELED                __BT_FUNC_STATUS_CANCELED
-
-#include <babeltrace2/undef-func-status.h>
+#define BT_FUNC_STATUS_OK              __BT_FUNC_STATUS_OK
+#define BT_FUNC_STATUS_OVERFLOW_ERROR  __BT_FUNC_STATUS_OVERFLOW_ERROR
 
 #endif /* BABELTRACE_FUNC_STATUS_INTERNAL_H */