tree-wide: random macro cleanups

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

diff --git a/src/lxc/attach.c b/src/lxc/attach.c
index c84c696f53061048070fd0b0fce57c91d5c26f92..094495f374bfaa10dd77b2fc8230758a197ea452 100644 (file)
--- a/src/lxc/attach.c
+++ b/src/lxc/attach.c
@@ -86,7 +86,7 @@
 lxc_log_define(lxc_attach, lxc);
 
 /* /proc/pid-to-str/current\0 = (5 + 21 + 7 + 1) */
-#define __LSMATTRLEN (5 + 21 + 7 + 1)
+#define __LSMATTRLEN (5 + (LXC_NUMSTRLEN64) + 7 + 1)
 static int lsm_openat(int procfd, pid_t pid, int on_exec)
 {
        int ret = -1;
@@ -182,7 +182,7 @@ out:
 }
 
 /* /proc/pid-to-str/status\0 = (5 + 21 + 7 + 1) */
-#define __PROC_STATUS_LEN (5 + 21 + 7 + 1)
+#define __PROC_STATUS_LEN (5 + (LXC_NUMSTRLEN64) + 7 + 1)
 static struct lxc_proc_context_info *lxc_proc_get_context_info(pid_t pid)
 {
        FILE *proc_file;

diff --git a/src/lxc/bdev/bdev.c b/src/lxc/bdev/bdev.c
index 1534cc9cfa5f3f35bddcacce7539ad8521c0542c..3526ed540fe1ce71e0764166fa96f596fafbe8ec 100644 (file)
--- a/src/lxc/bdev/bdev.c
+++ b/src/lxc/bdev/bdev.c
@@ -68,7 +68,7 @@
 #include "utils.h"
 
 #ifndef BLKGETSIZE64
-#define BLKGETSIZE64 _IOR(0x12,114,size_t)
+#define BLKGETSIZE64 _IOR(0x12, 114, size_t)
 #endif
 
 lxc_log_define(bdev, lxc);

diff --git a/src/lxc/bdev/bdev.h b/src/lxc/bdev/bdev.h
index 3f21e840435de10e2b51ee8752d71d53e6d54cc3..d8083cbf0a3e219db2c9952a0a8fc47faa08c953 100644 (file)
--- a/src/lxc/bdev/bdev.h
+++ b/src/lxc/bdev/bdev.h
@@ -47,7 +47,7 @@
 #endif
 
 #ifndef MS_SLAVE
-#define MS_SLAVE (1<<19)
+#define MS_SLAVE (1 << 19)
 #endif
 
 #ifndef MS_RELATIME

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index d3215d76cec1b4e2a4b7aa91feee9ca78bf16c27..2b772e2d46e789ca972c772b64c328aabcefaa6c 100644 (file)
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -357,22 +357,18 @@ static uint32_t *lxc_cpumask(char *buf, size_t nbits)
        return bitarr;
 }
 
-/* The largest integer that can fit into long int is 2^64. This is a
- * 20-digit number.
- */
-#define __IN_TO_STR_LEN 21
 /* Turn cpumask into simple, comma-separated cpulist. */
 static char *lxc_cpumask_to_cpulist(uint32_t *bitarr, size_t nbits)
 {
        size_t i;
        int ret;
-       char numstr[__IN_TO_STR_LEN] = {0};
+       char numstr[LXC_NUMSTRLEN64] = {0};
        char **cpulist = NULL;
 
        for (i = 0; i <= nbits; i++) {
                if (is_set(i, bitarr)) {
-                       ret = snprintf(numstr, __IN_TO_STR_LEN, "%zu", i);
-                       if (ret < 0 || (size_t)ret >= __IN_TO_STR_LEN) {
+                       ret = snprintf(numstr, LXC_NUMSTRLEN64, "%zu", i);
+                       if (ret < 0 || (size_t)ret >= LXC_NUMSTRLEN64) {
                                lxc_free_array((void **)cpulist, free);
                                return NULL;
                        }

diff --git a/src/lxc/commands.h b/src/lxc/commands.h
index e11a1398386435272ad1ff9a8b4ae4f8877dd063..184eefa09e623067096f5e3b7c3818753fc306a4 100644 (file)
--- a/src/lxc/commands.h
+++ b/src/lxc/commands.h
@@ -26,11 +26,11 @@
 
 #include "state.h"
 
-#define LXC_CMD_DATA_MAX (MAXPATHLEN*2)
+#define LXC_CMD_DATA_MAX (MAXPATHLEN * 2)
 
 /* https://developer.gnome.org/glib/2.28/glib-Type-Conversion-Macros.html */
-#define INT_TO_PTR(n) ((void *) (long) (n))
-#define PTR_TO_INT(p) ((int) (long) (p))
+#define INT_TO_PTR(n) ((void *)(long)(n))
+#define PTR_TO_INT(p) ((int)(long)(p))
 
 typedef enum {
        LXC_CMD_CONSOLE,

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index fb080aa5e3001e8dfc678df7d3477c66540551d1..8173b4f60a736a9fcc00332a6c2db63cff431d7f 100644 (file)
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -99,8 +99,6 @@
 
 lxc_log_define(lxc_conf, lxc);
 
-#define LINELEN 4096
-
 #if HAVE_SYS_CAPABILITY_H
 #ifndef CAP_SETFCAP
 #define CAP_SETFCAP 31
@@ -1281,7 +1279,7 @@ static int setup_rootfs(struct lxc_conf *conf)
 
 int prepare_ramfs_root(char *root)
 {
-       char buf[LINELEN], *p;
+       char buf[LXC_LINELEN], *p;
        char nroot[PATH_MAX];
        FILE *f;
        int i;
@@ -1326,7 +1324,7 @@ int prepare_ramfs_root(char *root)
                        SYSERROR("Unable to open /proc/self/mountinfo");
                        return -1;
                }
-               while (fgets(buf, LINELEN, f)) {
+               while (fgets(buf, LXC_LINELEN, f)) {
                        for (p = buf, i=0; p && i < 4; i++)
                                p = strchr(p+1, ' ');
                        if (!p)
@@ -3042,7 +3040,7 @@ bool lxc_delete_network(struct lxc_handler *handler)
 #define LXC_USERNIC_PATH LIBEXECDIR "/lxc/lxc-user-nic"
 
 /* lxc-user-nic returns "interface_name:interface_name\n" */
-#define MAX_BUFFER_SIZE IFNAMSIZ*2 + 2
+#define MAX_BUFFER_SIZE IFNAMSIZ * 2 + 2
 static int unpriv_assign_nic(const char *lxcpath, char *lxcname,
                             struct lxc_netdev *netdev, pid_t pid)
 {

diff --git a/src/lxc/genl.c b/src/lxc/genl.c
index b5a582e8ae0c5f783632cb404279b5b710ef058f..6afaf40ab9330961d061087b79e47a09e235b786 100644 (file)
--- a/src/lxc/genl.c
+++ b/src/lxc/genl.c
@@ -44,7 +44,7 @@ static int genetlink_resolve_family(const char *family)
        request = genlmsg_alloc(GENLMSG_GOOD_SIZE);
        if (!request)
                return -ENOMEM;
-               
+
        reply = genlmsg_alloc(GENLMSG_GOOD_SIZE);
        if (!reply) {
                genlmsg_free(request);
@@ -86,10 +86,10 @@ static int genetlink_resolve_family(const char *family)
        len -= NLMSG_LENGTH(GENL_HDRLEN);
        if (len < 0)
                goto out_close;
-       
+
        attr = (struct nlattr *)GENLMSG_DATA(reply);
        attr = (struct nlattr *)((char *)attr + NLA_ALIGN(attr->nla_len));
-       
+
        ret = -ENOMSG;
        if (attr->nla_type != CTRL_ATTR_FAMILY_ID)
                goto out_close;

diff --git a/src/lxc/log.c b/src/lxc/log.c
index 549a1602b9988ae89871bfd119736dd357bd1b42..27aa2c468b478d282be5fd29251585a4edfb2ffe 100644 (file)
--- a/src/lxc/log.c
+++ b/src/lxc/log.c
@@ -50,7 +50,7 @@
  * datatype is currently at maximum a 64bit integer, we have a date string that
  * is of maximum length (2^64 - 1) * 2 = (21 + 21) = 42.
  */
-#define LXC_LOG_TIME_SIZE  ((__LXC_NUMSTRLEN) * 2)
+#define LXC_LOG_TIME_SIZE ((LXC_NUMSTRLEN64)*2)
 
 int lxc_log_fd = -1;
 static int syslog_enable = 0;
@@ -145,7 +145,7 @@ int lxc_unix_epoch_to_utc(char *buf, size_t bufsize, const struct timespec *time
 {
        int64_t epoch_to_days, z, era, doe, yoe, year, doy, mp, day, month,
            d_in_s, hours, h_in_s, minutes, seconds;
-       char nanosec[__LXC_NUMSTRLEN];
+       char nanosec[LXC_NUMSTRLEN64];
        int ret;
 
        /* See https://howardhinnant.github.io/date_algorithms.html for an
@@ -217,8 +217,8 @@ int lxc_unix_epoch_to_utc(char *buf, size_t bufsize, const struct timespec *time
        seconds = (time->tv_sec - d_in_s - h_in_s - (minutes * 60));
 
        /* Make string from nanoseconds. */
-       ret = snprintf(nanosec, __LXC_NUMSTRLEN, "%ld", time->tv_nsec);
-       if (ret < 0 || ret >= __LXC_NUMSTRLEN)
+       ret = snprintf(nanosec, LXC_NUMSTRLEN64, "%ld", time->tv_nsec);
+       if (ret < 0 || ret >= LXC_NUMSTRLEN64)
                return -1;
 
        /* Create final timestamp for the log and shorten nanoseconds to 3

diff --git a/src/lxc/monitor.c b/src/lxc/monitor.c
index 793fbde098d595d891cd120bfd0936b3c8734dce..483e06bf8c188023a9b018f2662fe24d6c15b43d 100644 (file)
--- a/src/lxc/monitor.c
+++ b/src/lxc/monitor.c
@@ -284,12 +284,11 @@ int lxc_monitor_read(int fd, struct lxc_msg *msg)
 /* Used to spawn a monitord either on startup of a daemon container, or when
  * lxc-monitor starts.
  */
-#define __INT_LEN 21
 int lxc_monitord_spawn(const char *lxcpath)
 {
        int ret;
        int pipefd[2];
-       char pipefd_str[__INT_LEN];
+       char pipefd_str[LXC_NUMSTRLEN64];
        pid_t pid1, pid2;
 
        char *const args[] = {
@@ -356,8 +355,8 @@ int lxc_monitord_spawn(const char *lxcpath)
 
        close(pipefd[0]);
 
-       ret = snprintf(pipefd_str, __INT_LEN, "%d", pipefd[1]);
-       if (ret < 0 || ret >= __INT_LEN) {
+       ret = snprintf(pipefd_str, LXC_NUMSTRLEN64, "%d", pipefd[1]);
+       if (ret < 0 || ret >= LXC_NUMSTRLEN64) {
                ERROR("Failed to create pid argument to pass to monitord.");
                exit(EXIT_FAILURE);
        }

diff --git a/src/lxc/nl.h b/src/lxc/nl.h
index d347835fa589626e876fb04e2b0082c5d64636e6..0bf62d5804ae27b90c5693771f8d781edbe41579 100644 (file)
--- a/src/lxc/nl.h
+++ b/src/lxc/nl.h
@@ -30,8 +30,7 @@
 #define PAGE_SIZE 4096
 #endif
 #define NLMSG_GOOD_SIZE (2*PAGE_SIZE)
-#define NLMSG_TAIL(nmsg) \
-        ((struct rtattr *) (((void *) (nmsg)) + NLMSG_ALIGN((nmsg)->nlmsg_len)))
+#define NLMSG_TAIL(nmsg) ((struct rtattr *) (((void *) (nmsg)) + NLMSG_ALIGN((nmsg)->nlmsg_len)))
 #define NLA_DATA(na) ((void *)((char*)(na) + NLA_HDRLEN))
 #define NLA_NEXT_ATTR(attr) ((void *)((char *)attr) + NLA_ALIGN(attr->nla_len))
 

diff --git a/src/lxc/tools/lxc_checkpoint.c b/src/lxc/tools/lxc_checkpoint.c
index eeddf59162184376f0e2c58a6ff959d290124cd2..c42cecdb3d82b0aab2573aaceeed3136fad222b0 100644 (file)
--- a/src/lxc/tools/lxc_checkpoint.c
+++ b/src/lxc/tools/lxc_checkpoint.c
@@ -39,7 +39,7 @@ static bool daemonize_set = false;
 static bool pre_dump = false;
 static char *predump_dir = NULL;
 
-#define OPT_PREDUMP_DIR OPT_USAGE+1
+#define OPT_PREDUMP_DIR OPT_USAGE + 1
 
 static const struct option my_longopts[] = {
        {"checkpoint-dir", required_argument, 0, 'D'},

diff --git a/src/lxc/tools/lxc_init.c b/src/lxc/tools/lxc_init.c
index 5dd29afbefeee5c1020598b4c37d3e08a79acf6c..1aaa96cd653eacc0970bfa982ca457da4e448eb6 100644 (file)
--- a/src/lxc/tools/lxc_init.c
+++ b/src/lxc/tools/lxc_init.c
@@ -21,6 +21,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#define _GNU_SOURCE
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -30,7 +31,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#define _GNU_SOURCE
 #include <getopt.h>
 
 #include "log.h"

diff --git a/src/lxc/tools/lxc_ls.c b/src/lxc/tools/lxc_ls.c
index b5ddeefdbebcf936d33b63d5c907a236ab535fec..363d3d26bb35195ff8091069fa742599330216e5 100644 (file)
--- a/src/lxc/tools/lxc_ls.c
+++ b/src/lxc/tools/lxc_ls.c
@@ -43,7 +43,6 @@
 
 lxc_log_define(lxc_ls, lxc);
 
-#define LINELEN 1024
 /* Per default we only allow five levels of recursion to protect the stack at
  * least a little bit. */
 #define MAX_NESTLVL 5

diff --git a/src/lxc/tools/lxc_start.c b/src/lxc/tools/lxc_start.c
index eaa8da4183fa276d6d752f18bb3cd89528ee7235..984a28fd1ebdba8cce4bdfc80aeec20204fc711b 100644 (file)
--- a/src/lxc/tools/lxc_start.c
+++ b/src/lxc/tools/lxc_start.c
@@ -50,9 +50,9 @@
 #include "confile.h"
 #include "arguments.h"
 
-#define OPT_SHARE_NET OPT_USAGE+1
-#define OPT_SHARE_IPC OPT_USAGE+2
-#define OPT_SHARE_UTS OPT_USAGE+3
+#define OPT_SHARE_NET OPT_USAGE + 1
+#define OPT_SHARE_IPC OPT_USAGE + 2
+#define OPT_SHARE_UTS OPT_USAGE + 3
 
 lxc_log_define(lxc_start_ui, lxc);
 

diff --git a/src/lxc/tools/lxc_stop.c b/src/lxc/tools/lxc_stop.c
index 64b742d98ce6dde56d1049b786b656613209c8f9..e2d64fb5cca0fb2b1ad7157008be9333aa8e29bd 100644 (file)
--- a/src/lxc/tools/lxc_stop.c
+++ b/src/lxc/tools/lxc_stop.c
@@ -33,8 +33,8 @@
 #include "commands.h"
 #include "utils.h"
 
-#define OPT_NO_LOCK OPT_USAGE+1
-#define OPT_NO_KILL OPT_USAGE+2
+#define OPT_NO_LOCK OPT_USAGE + 1
+#define OPT_NO_KILL OPT_USAGE + 2
 
 lxc_log_define(lxc_stop_ui, lxc);
 

diff --git a/src/lxc/tools/lxc_usernsexec.c b/src/lxc/tools/lxc_usernsexec.c
index 9905d53b39aa91acf15394dd8285e263772e261f..7fd2acabb9f9c4d4e1a6c1f5d1c4e3706e345561 100644 (file)
--- a/src/lxc/tools/lxc_usernsexec.c
+++ b/src/lxc/tools/lxc_usernsexec.c
@@ -50,7 +50,7 @@
 #endif
 
 #ifndef MS_SLAVE
-#define MS_SLAVE (1<<19)
+#define MS_SLAVE (1 << 19)
 #endif
 
 int unshare(int flags);

diff --git a/src/lxc/utils.c b/src/lxc/utils.c
index 7ddf1dbc74c897311d4e5ec66d0722fa8b6b57ee..7c2098e1a7df421d4e9c76c02a0b3f19fe8f1ea8 100644 (file)
--- a/src/lxc/utils.c
+++ b/src/lxc/utils.c
@@ -1093,10 +1093,9 @@ uint64_t fnv_64a_buf(void *buf, size_t len, uint64_t hval)
  * is MS_SHARED, but not '/', then you're out of luck - figuring that
  * out would be too much work to be worth it.
  */
-#define LINELEN 4096
 int detect_shared_rootfs(void)
 {
-       char buf[LINELEN], *p;
+       char buf[LXC_LINELEN], *p;
        FILE *f;
        int i;
        char *p2;
@@ -1104,18 +1103,18 @@ int detect_shared_rootfs(void)
        f = fopen("/proc/self/mountinfo", "r");
        if (!f)
                return 0;
-       while (fgets(buf, LINELEN, f)) {
-               for (p = buf, i=0; p && i < 4; i++)
-                       p = strchr(p+1, ' ');
+       while (fgets(buf, LXC_LINELEN, f)) {
+               for (p = buf, i = 0; p && i < 4; i++)
+                       p = strchr(p + 1, ' ');
                if (!p)
                        continue;
-               p2 = strchr(p+1, ' ');
+               p2 = strchr(p + 1, ' ');
                if (!p2)
                        continue;
                *p2 = '\0';
-               if (strcmp(p+1, "/") == 0) {
+               if (strcmp(p + 1, "/") == 0) {
                        // this is '/'.  is it shared?
-                       p = strchr(p2+1, ' ');
+                       p = strchr(p2 + 1, ' ');
                        if (p && strstr(p, "shared:")) {
                                fclose(f);
                                return 1;
@@ -1897,7 +1896,7 @@ int lxc_strmunmap(void *addr, size_t length)
 
 /* Check whether a signal is blocked by a process. */
 /* /proc/pid-to-str/status\0 = (5 + 21 + 7 + 1) */
-#define __PROC_STATUS_LEN (5 + 21 + 7 + 1)
+#define __PROC_STATUS_LEN (5 + (LXC_NUMSTRLEN64) + 7 + 1)
 bool task_blocking_signal(pid_t pid, int signal)
 {
        bool bret = false;

diff --git a/src/lxc/utils.h b/src/lxc/utils.h
index 3d1ecee4ad35dae13a40281ec3238b2e910283a6..b7dcd5d92d0951a0142c0cacf31fafe1124987ec 100644 (file)
--- a/src/lxc/utils.h
+++ b/src/lxc/utils.h
@@ -37,7 +37,8 @@
 
 /* Useful macros */
 /* Maximum number for 64 bit integer is a string with 21 digits: 2^64 - 1 = 21 */
-#define __LXC_NUMSTRLEN 21
+#define LXC_NUMSTRLEN64 21
+#define LXC_LINELEN 4096
 
 /* returns 1 on success, 0 if there were any failures */
 extern int lxc_rmdir_onedev(char *path, const char *exclude);

diff --git a/src/tests/concurrent.c b/src/tests/concurrent.c
index e6899adc5012e85260127cb3b4a4822fd3c23632..bfefa48094e2dff65b9fe20fdb05df4912103b1c 100644 (file)
--- a/src/tests/concurrent.c
+++ b/src/tests/concurrent.c
@@ -16,13 +16,13 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#define _GNU_SOURCE
 #include <limits.h>
 #include <stdio.h>
 #include <pthread.h>
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
-#define _GNU_SOURCE
 #include <getopt.h>
 
 #include <lxc/lxccontainer.h>

diff --git a/src/tests/lxc-test-utils.c b/src/tests/lxc-test-utils.c
index 800c0298d02fb0f8136ce87c471ac336aebe31b8..d4363b8b418258ba217c0cf9e5172bde498d861b 100644 (file)
--- a/src/tests/lxc-test-utils.c
+++ b/src/tests/lxc-test-utils.c
@@ -71,7 +71,7 @@ void test_lxc_deslashify(void)
 }
 
 /* /proc/int_as_str/ns/mnt\0 = (5 + 21 + 7 + 1) */
-#define __MNTNS_LEN (5 + 21 + 7 + 1)
+#define __MNTNS_LEN (5 + (LXC_NUMSTRLEN64) + 7 + 1)
 void test_detect_ramfs_rootfs(void)
 {
        size_t i;