提交 c7f70f43 编写于 作者: D Daniel Veillard

Fix some cppi prepocessor indentation issues

* src/conf/nwfilter_conf.c src/util/hooks.c: added spaces to avoid
  "make syntax-check" failures
上级 4a2dd00e
......@@ -52,13 +52,13 @@
* locally defined enums for all constants
*/
#ifndef ETHERTYPE_IP
#define ETHERTYPE_IP 0x0800
# define ETHERTYPE_IP 0x0800
#endif
#ifndef ETHERTYPE_ARP
#define ETHERTYPE_ARP 0x0806
# define ETHERTYPE_ARP 0x0806
#endif
#ifndef ETHERTYPE_IPV6
#define ETHERTYPE_IPV6 0x86dd
# define ETHERTYPE_IPV6 0x86dd
#endif
#define VIR_FROM_THIS VIR_FROM_NWFILTER
......
......@@ -25,7 +25,7 @@
#include <sys/types.h>
#if HAVE_SYS_WAIT_H
#include <sys/wait.h>
# include <sys/wait.h>
#endif
#include <sys/stat.h>
#include <unistd.h>
......@@ -274,7 +274,7 @@ virHookCall(int driver, const char *id, int op, int sub_op, const char *extra,
/*
* Convenience macros borrowed from qemudBuildCommandLine()
*/
#define ADD_ARG_SPACE \
# define ADD_ARG_SPACE \
do { \
if (argc == arga) { \
arga += 10; \
......@@ -283,20 +283,20 @@ virHookCall(int driver, const char *id, int op, int sub_op, const char *extra,
} \
} while (0)
#define ADD_ARG(thisarg) \
# define ADD_ARG(thisarg) \
do { \
ADD_ARG_SPACE; \
argv[argc++] = thisarg; \
} while (0)
#define ADD_ARG_LIT(thisarg) \
# define ADD_ARG_LIT(thisarg) \
do { \
ADD_ARG_SPACE; \
if ((argv[argc++] = strdup(thisarg)) == NULL) \
goto no_memory; \
} while (0)
#define ADD_ENV_SPACE \
# define ADD_ENV_SPACE \
do { \
if (envc == enva) { \
enva += 10; \
......@@ -305,20 +305,20 @@ virHookCall(int driver, const char *id, int op, int sub_op, const char *extra,
} \
} while (0)
#define ADD_ENV(thisarg) \
# define ADD_ENV(thisarg) \
do { \
ADD_ENV_SPACE; \
env[envc++] = thisarg; \
} while (0)
#define ADD_ENV_LIT(thisarg) \
# define ADD_ENV_LIT(thisarg) \
do { \
ADD_ENV_SPACE; \
if ((env[envc++] = strdup(thisarg)) == NULL) \
goto no_memory; \
} while (0)
#define ADD_ENV_PAIR(envname, val) \
# define ADD_ENV_PAIR(envname, val) \
do { \
char *envval; \
ADD_ENV_SPACE; \
......@@ -327,7 +327,7 @@ virHookCall(int driver, const char *id, int op, int sub_op, const char *extra,
env[envc++] = envval; \
} while (0)
#define ADD_ENV_COPY(envname) \
# define ADD_ENV_COPY(envname) \
do { \
char *val = getenv(envname); \
if (val != NULL) { \
......@@ -453,13 +453,13 @@ no_memory:
goto cleanup;
#undef ADD_ARG
#undef ADD_ARG_LIT
#undef ADD_ARG_SPACE
#undef ADD_USBDISK
#undef ADD_ENV
#undef ADD_ENV_COPY
#undef ADD_ENV_LIT
#undef ADD_ENV_SPACE
# undef ADD_ARG
# undef ADD_ARG_LIT
# undef ADD_ARG_SPACE
# undef ADD_USBDISK
# undef ADD_ENV
# undef ADD_ENV_COPY
# undef ADD_ENV_LIT
# undef ADD_ENV_SPACE
}
#endif
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册