shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-12-06 00:24:43 +03:00
Code Releases Activity

Fix some cppi prepocessor indentation issues

Browse Source 
* src/conf/nwfilter_conf.c src/util/hooks.c: added spaces to avoid
  "make syntax-check" failures
This commit is contained in:
Daniel Veillard
2010-04-09 15:10:46 +02:00
parent 4a2dd00e76
commit c7f70f4357
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/conf/nwfilter_conf.c
View File

@@ -52,13 +52,13 @@
* locally defined enums for all constants * locally defined enums for all constants
*/ */
#ifndef ETHERTYPE_IP #ifndef ETHERTYPE_IP
#define ETHERTYPE_IP 0x0800 # define ETHERTYPE_IP 0x0800
#endif #endif
#ifndef ETHERTYPE_ARP #ifndef ETHERTYPE_ARP
#define ETHERTYPE_ARP 0x0806 # define ETHERTYPE_ARP 0x0806
#endif #endif
#ifndef ETHERTYPE_IPV6 #ifndef ETHERTYPE_IPV6
#define ETHERTYPE_IPV6 0x86dd # define ETHERTYPE_IPV6 0x86dd
#endif #endif
#define VIR_FROM_THIS VIR_FROM_NWFILTER #define VIR_FROM_THIS VIR_FROM_NWFILTER

34
src/util/hooks.c
View File

@@ -25,7 +25,7 @@
#include <sys/types.h> #include <sys/types.h>
#if HAVE_SYS_WAIT_H #if HAVE_SYS_WAIT_H
#include <sys/wait.h> # include <sys/wait.h>
#endif #endif
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.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() * Convenience macros borrowed from qemudBuildCommandLine()
*/ */
#define ADD_ARG_SPACE \ # define ADD_ARG_SPACE \
do { \ do { \
if (argc == arga) { \ if (argc == arga) { \
arga += 10; \ arga += 10; \
@@ -283,20 +283,20 @@ virHookCall(int driver, const char *id, int op, int sub_op, const char *extra,
} \ } \
} while (0) } while (0)
#define ADD_ARG(thisarg) \ # define ADD_ARG(thisarg) \
do { \ do { \
ADD_ARG_SPACE; \ ADD_ARG_SPACE; \
argv[argc++] = thisarg; \ argv[argc++] = thisarg; \
} while (0) } while (0)
#define ADD_ARG_LIT(thisarg) \ # define ADD_ARG_LIT(thisarg) \
do { \ do { \
ADD_ARG_SPACE; \ ADD_ARG_SPACE; \
if ((argv[argc++] = strdup(thisarg)) == NULL) \ if ((argv[argc++] = strdup(thisarg)) == NULL) \
goto no_memory; \ goto no_memory; \
} while (0) } while (0)
#define ADD_ENV_SPACE \ # define ADD_ENV_SPACE \
do { \ do { \
if (envc == enva) { \ if (envc == enva) { \
enva += 10; \ enva += 10; \
@@ -305,20 +305,20 @@ virHookCall(int driver, const char *id, int op, int sub_op, const char *extra,
} \ } \
} while (0) } while (0)
#define ADD_ENV(thisarg) \ # define ADD_ENV(thisarg) \
do { \ do { \
ADD_ENV_SPACE; \ ADD_ENV_SPACE; \
env[envc++] = thisarg; \ env[envc++] = thisarg; \
} while (0) } while (0)
#define ADD_ENV_LIT(thisarg) \ # define ADD_ENV_LIT(thisarg) \
do { \ do { \
ADD_ENV_SPACE; \ ADD_ENV_SPACE; \
if ((env[envc++] = strdup(thisarg)) == NULL) \ if ((env[envc++] = strdup(thisarg)) == NULL) \
goto no_memory; \ goto no_memory; \
} while (0) } while (0)
#define ADD_ENV_PAIR(envname, val) \ # define ADD_ENV_PAIR(envname, val) \
do { \ do { \
char *envval; \ char *envval; \
ADD_ENV_SPACE; \ ADD_ENV_SPACE; \
@@ -327,7 +327,7 @@ virHookCall(int driver, const char *id, int op, int sub_op, const char *extra,
env[envc++] = envval; \ env[envc++] = envval; \
} while (0) } while (0)
#define ADD_ENV_COPY(envname) \ # define ADD_ENV_COPY(envname) \
do { \ do { \
char *val = getenv(envname); \ char *val = getenv(envname); \
if (val != NULL) { \ if (val != NULL) { \
@@ -453,13 +453,13 @@ no_memory:
goto cleanup; goto cleanup;
#undef ADD_ARG # undef ADD_ARG
#undef ADD_ARG_LIT # undef ADD_ARG_LIT
#undef ADD_ARG_SPACE # undef ADD_ARG_SPACE
#undef ADD_USBDISK # undef ADD_USBDISK
#undef ADD_ENV # undef ADD_ENV
#undef ADD_ENV_COPY # undef ADD_ENV_COPY
#undef ADD_ENV_LIT # undef ADD_ENV_LIT
#undef ADD_ENV_SPACE # undef ADD_ENV_SPACE
} }
#endif #endif