error_utils: move error helper to separate header

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index fb18e4f1b58f7c804912681f8d5ca2cd25d2e3b1..634396fa8242d2411ec4181218eecd07f6d58062 100644 (file)
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -18,6 +18,7 @@ noinst_HEADERS = api_extensions.h \
                 confile_utils.h \
                 criu.h \
                 error.h \
+                error_utils.h \
                 file_utils.h \
                 ../include/netns_ifaddrs.h \
                 initutils.h \
@@ -117,6 +118,7 @@ liblxc_la_SOURCES = af_unix.c af_unix.h \
                    criu.c criu.h \
                    error.c error.h \
                    execute.c \
+                   error_utils.h \
                    freezer.c \
                    file_utils.c file_utils.h \
                    ../include/netns_ifaddrs.c ../include/netns_ifaddrs.h \

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index 3e057e54e11861c1350d0fe7e0e2548bfdd44825..fd7c825614ef76b2326129085cb1d9da7f5cec45 100644 (file)
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -40,6 +40,7 @@
 #include "commands_utils.h"
 #include "conf.h"
 #include "config.h"
+#include "error_utils.h"
 #include "log.h"
 #include "macro.h"
 #include "mainloop.h"

diff --git a/src/lxc/error_utils.h b/src/lxc/error_utils.h
new file mode 100644 (file)
index 0000000..e650861
--- /dev/null
+++ b/src/lxc/error_utils.h
@@ -0,0 +1,43 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
+
+#ifndef __LXC_ERROR_UTILS_H
+#define __LXC_ERROR_UTILS_H
+
+#define MAX_ERRNO 4095
+
+#define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
+
+static inline void *ERR_PTR(long error)
+{
+       return (void *)error;
+}
+
+static inline long PTR_ERR(const void *ptr)
+{
+       return (long)ptr;
+}
+
+static inline long IS_ERR(const void *ptr)
+{
+       return IS_ERR_VALUE((unsigned long)ptr);
+}
+
+static inline long IS_ERR_OR_NULL(const void *ptr)
+{
+       return !ptr || IS_ERR_VALUE((unsigned long)ptr);
+}
+
+static inline void *ERR_CAST(const void *ptr)
+{
+       return (void *)ptr;
+}
+
+static inline int PTR_RET(const void *ptr)
+{
+       if (IS_ERR(ptr))
+               return PTR_ERR(ptr);
+       else
+               return 0;
+}
+
+#endif /* __LXC_ERROR_UTILS_H */

diff --git a/src/lxc/macro.h b/src/lxc/macro.h
index c33480cc7977f7bff6ccfd6e4ab3a96e1cf0288c..c98ca5900354b368200afe910082a540b2b4c129 100644 (file)
--- a/src/lxc/macro.h
+++ b/src/lxc/macro.h
@@ -700,43 +700,6 @@ enum {
                (b) = __tmp;           \
        } while (0)
 
-#define MAX_ERRNO 4095
-
-#define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
-
-static inline void *ERR_PTR(long error)
-{
-       return (void *)error;
-}
-
-static inline long PTR_ERR(const void *ptr)
-{
-       return (long)ptr;
-}
-
-static inline long IS_ERR(const void *ptr)
-{
-       return IS_ERR_VALUE((unsigned long)ptr);
-}
-
-static inline long IS_ERR_OR_NULL(const void *ptr)
-{
-       return !ptr || IS_ERR_VALUE((unsigned long)ptr);
-}
-
-static inline void *ERR_CAST(const void *ptr)
-{
-       return (void *)ptr;
-}
-
-static inline int PTR_RET(const void *ptr)
-{
-       if (IS_ERR(ptr))
-               return PTR_ERR(ptr);
-       else
-               return 0;
-}
-
 #define min(x, y)                              \
        ({                                     \
                typeof(x) _min1 = (x);         \

diff --git a/src/lxc/memory_utils.h b/src/lxc/memory_utils.h
index 143cb8a84d2ddac97b076039ccb33d6dcee89eca..7e4d0541f3842df969265ba63420ed9030e8af61 100644 (file)
--- a/src/lxc/memory_utils.h
+++ b/src/lxc/memory_utils.h
@@ -11,6 +11,7 @@
 #include <unistd.h>
 
 #include "macro.h"
+#include "error_utils.h"
 
 #define define_cleanup_function(type, cleaner)           \
        static inline void cleaner##_function(type *ptr) \