filter new files through cppi, so syntax-check passes once again

* src/conf/nwfilter_conf.h: Indent cpp directives.
* src/conf/nwfilter_params.h: Likewise.
* src/datatypes.h: Likewise.
* src/nwfilter/nwfilter_driver.h: Likewise.
* src/nwfilter/nwfilter_ebiptables_driver.h: Likewise.
* src/nwfilter/nwfilter_gentech_driver.h: Likewise.
This commit is contained in:
Jim Meyering 2010-03-26 19:29:54 +01:00 committed by Jiri Denemark
parent 447c586a0d
commit 19a863c435
6 changed files with 24 additions and 24 deletions

View File

@ -24,15 +24,15 @@
* Author: Stefan Berger <stefanb@us.ibm.com>
*/
#ifndef NWFILTER_CONF_H
#define NWFILTER_CONF_H
# define NWFILTER_CONF_H
#include <stdint.h>
#include <stddef.h>
# include <stdint.h>
# include <stddef.h>
#include "internal.h"
#include "util.h"
#include "hash.h"
#include "xml.h"
# include "internal.h"
# include "util.h"
# include "hash.h"
# include "xml.h"
/**
* Chain suffix size is:
@ -43,7 +43,7 @@
* terminating '0' =
* 32-3-15-1-1 = 12
*/
#define MAX_CHAIN_SUFFIX_SIZE 12
# define MAX_CHAIN_SUFFIX_SIZE 12
enum virNWFilterEntryItemFlags {
@ -53,10 +53,10 @@ enum virNWFilterEntryItemFlags {
};
#define HAS_ENTRY_ITEM(data) \
# define HAS_ENTRY_ITEM(data) \
(((data)->flags) & NWFILTER_ENTRY_ITEM_FLAG_EXISTS)
#define ENTRY_GET_NEG_SIGN(data) \
# define ENTRY_GET_NEG_SIGN(data) \
((((data)->flags) & NWFILTER_ENTRY_ITEM_FLAG_IS_NEG) ? "!" : "")
// datatypes appearing in rule attributes
@ -288,7 +288,7 @@ enum virNWFilterEbtablesTableType {
};
#define MAX_RULE_PRIORITY 1000
# define MAX_RULE_PRIORITY 1000
typedef struct _virNWFilterRuleDef virNWFilterRuleDef;
@ -522,7 +522,7 @@ void virNWFilterConfLayerShutdown(void);
int virNWFilterParamConfLayerInit(void);
void virNWFilterParamConfLayerShutdown(void);
#define virNWFilterReportError(conn, code, fmt...) \
# define virNWFilterReportError(conn, code, fmt...) \
virReportErrorHelper(conn, VIR_FROM_NWFILTER, code, __FILE__, \
__FUNCTION__, __LINE__, fmt)

View File

@ -20,9 +20,9 @@
* Author: Stefan Berger <stefanb@us.ibm.com>
*/
#ifndef NWFILTER_PARAMS_H
#define NWFILTER_PARAMS_H
# define NWFILTER_PARAMS_H
#include "hash.h"
# include "hash.h"
typedef struct _virNWFilterHashTable virNWFilterHashTable;
typedef virNWFilterHashTable *virNWFilterHashTablePtr;

View File

@ -126,9 +126,9 @@
* magic value used to protect the API when pointers to network filter
* pool structures are passed down by the users.
*/
#define VIR_NWFILTER_MAGIC 0xDEAD7777
#define VIR_IS_NWFILTER(obj) ((obj) && (obj)->magic==VIR_NWFILTER_MAGIC)
#define VIR_IS_CONNECTED_NWFILTER(obj) (VIR_IS_NWFILTER(obj) && VIR_IS_CONNECT((obj)->conn))
# define VIR_NWFILTER_MAGIC 0xDEAD7777
# define VIR_IS_NWFILTER(obj) ((obj) && (obj)->magic==VIR_NWFILTER_MAGIC)
# define VIR_IS_CONNECTED_NWFILTER(obj) (VIR_IS_NWFILTER(obj) && VIR_IS_CONNECT((obj)->conn))
/**

View File

@ -26,10 +26,10 @@
*/
#ifndef __VIR_NWFILTER_DRIVER_H__
#define __VIR_NWFILTER_DRIVER_H__
# define __VIR_NWFILTER_DRIVER_H__
#include "nwfilter_params.h"
#include "nwfilter_conf.h"
# include "nwfilter_params.h"
# include "nwfilter_conf.h"
int nwfilterRegister(void);

View File

@ -21,9 +21,9 @@
* Author: Stefan Berger <stefanb@us.ibm.com>
*/
#ifndef VIR_NWFILTER_EBTABLES_DRIVER_H__
#define VIR_NWFILTER_EBTABLES_DRIVER_H__
# define VIR_NWFILTER_EBTABLES_DRIVER_H__
#define MAX_CHAINNAME_LENGTH 32 /* see linux/netfilter_bridge/ebtables.h */
# define MAX_CHAINNAME_LENGTH 32 /* see linux/netfilter_bridge/ebtables.h */
enum RuleType {
RT_EBTABLES,
@ -43,6 +43,6 @@ struct _ebiptablesRuleInst {
extern virNWFilterTechDriver ebiptables_driver;
#define EBIPTABLES_DRIVER_ID "ebiptables"
# define EBIPTABLES_DRIVER_ID "ebiptables"
#endif

View File

@ -21,7 +21,7 @@
* Author: Stefan Berger <stefanb@us.ibm.com>
*/
#ifndef __NWFILTER_GENTECH_DRIVER_H
#define __NWFILTER_GENTECH_DRIVER_H
# define __NWFILTER_GENTECH_DRIVER_H
virNWFilterTechDriverPtr virNWFilterTechDriverForName(const char *name);