diff options
author | /C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net </C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net> | 2008-01-12 14:54:41 +0000 |
---|---|---|
committer | /C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net </C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net> | 2008-01-12 14:54:41 +0000 |
commit | 77cd9a7241fd588f4be0d8c26f8aacf3a68f5dc5 (patch) | |
tree | 3a53aa248af963c2f3110774d6a0f4b47977c476 | |
parent | 546804b93f692836769d27ebda986fd4ca1aa5ca (diff) |
Ulogd2: fix some indenting
The following patch fixes some indenting and typo in various ulogd2
files.
Eric Leblond <eric@inl.fr>
-rw-r--r-- | input/flow/ulogd_inpflow_NFCT.c | 38 | ||||
-rw-r--r-- | src/ulogd.c | 8 |
2 files changed, 23 insertions, 23 deletions
diff --git a/input/flow/ulogd_inpflow_NFCT.c b/input/flow/ulogd_inpflow_NFCT.c index 34b49be..d3cd20c 100644 --- a/input/flow/ulogd_inpflow_NFCT.c +++ b/input/flow/ulogd_inpflow_NFCT.c @@ -190,24 +190,24 @@ static struct ulogd_key nfct_okeys[] = { .field_id = IPFIX_icmpTypeIPv4, }, }, - { - .type = ULOGD_RET_UINT32, - .flags = ULOGD_RETF_NONE, - .name = "ct.mark", - .ipfix = { - .vendor = IPFIX_VENDOR_NETFILTER, - .field_id = IPFIX_NF_mark, - }, - }, - { - .type = ULOGD_RET_UINT32, - .flags = ULOGD_RETF_NONE, - .name = "ct.id", - .ipfix = { - .vendor = IPFIX_VENDOR_NETFILTER, - .field_id = IPFIX_NF_conntrack_id, - }, - }, + { + .type = ULOGD_RET_UINT32, + .flags = ULOGD_RETF_NONE, + .name = "ct.mark", + .ipfix = { + .vendor = IPFIX_VENDOR_NETFILTER, + .field_id = IPFIX_NF_mark, + }, + }, + { + .type = ULOGD_RET_UINT32, + .flags = ULOGD_RETF_NONE, + .name = "ct.id", + .ipfix = { + .vendor = IPFIX_VENDOR_NETFILTER, + .field_id = IPFIX_NF_conntrack_id, + }, + }, { .type = ULOGD_RET_UINT32, .flags = ULOGD_RETF_NONE, @@ -268,7 +268,7 @@ static struct ct_htable *htable_alloc(int htable_size, int prealloc) INIT_LLIST_HEAD(&htable->idle); for (i = 0; i < htable->num_buckets; i++) - INIT_LLIST_HEAD(&htable->buckets[i]); + INIT_LLIST_HEAD(&htable->buckets[i]); if (!htable->prealloc) return htable; diff --git a/src/ulogd.c b/src/ulogd.c index 853b408..ca5fb06 100644 --- a/src/ulogd.c +++ b/src/ulogd.c @@ -422,8 +422,8 @@ pluginstance_alloc_init(struct ulogd_plugin *pl, char *pi_id, ptr += pi->config_kset->num_ces * sizeof(struct config_entry); memcpy(pi->config_kset->ces, pl->config_kset->ces, - pi->config_kset->num_ces - *sizeof(struct config_entry)); + pi->config_kset->num_ces + * sizeof(struct config_entry)); } } else pi->config_kset = NULL; @@ -653,7 +653,7 @@ static int create_stack(const char *option) plname = equals+1; /* find matching plugin */ - pl = find_plugin(plname); + pl = find_plugin(plname); if (!pl) { ulogd_log(ULOGD_ERROR, "can't find requested plugin " "%s\n", plname); @@ -944,7 +944,7 @@ int main(int argc, char* argv[]) warn_and_exit(daemonize); } if (setegid(gid)) { - ulogd_log(ULOGD_FATAL, "can't sett effective GID %u\n", + ulogd_log(ULOGD_FATAL, "can't set effective GID %u\n", gid); warn_and_exit(daemonize); } |