diff options
| -rw-r--r-- | src/rule.c | 8 | ||||
| -rw-r--r-- | tests/monitor/testcases/set-maps.t | 2 | ||||
| -rw-r--r-- | tests/monitor/testcases/set-mixed.t | 2 | ||||
| -rw-r--r-- | tests/monitor/testcases/set-multiple.t | 4 | ||||
| -rw-r--r-- | tests/monitor/testcases/set-simple.t | 2 |
5 files changed, 9 insertions, 9 deletions
@@ -335,18 +335,18 @@ static void set_print_declaration(const struct set *set, printf("%stimeout", delim); delim = ","; } - printf("%s", opts->nl); + printf("%s", opts->stmt_separator); } if (set->timeout) { printf("%s%stimeout ", opts->tab, opts->tab); time_print(set->timeout / 1000); - printf("%s", opts->nl); + printf("%s", opts->stmt_separator); } if (set->gc_int) { printf("%s%sgc-interval ", opts->tab, opts->tab); time_print(set->gc_int / 1000); - printf("%s", opts->nl); + printf("%s", opts->stmt_separator); } } @@ -381,7 +381,7 @@ void set_print_plain(const struct set *s, struct output_ctx *octx) .nl = " ", .table = s->handle.table, .family = family2str(s->handle.family), - .stmt_separator = ";", + .stmt_separator = "; ", }; do_set_print(s, &opts, octx); diff --git a/tests/monitor/testcases/set-maps.t b/tests/monitor/testcases/set-maps.t index d94016be..6ea36cb9 100644 --- a/tests/monitor/testcases/set-maps.t +++ b/tests/monitor/testcases/set-maps.t @@ -2,7 +2,7 @@ I add table ip t O add table ip t I add map ip t portip { type inet_service: ipv4_addr; flags interval; } -O add map ip t portip { type inet_service : ipv4_addr;flags interval } +O add map ip t portip { type inet_service : ipv4_addr;flags interval; } I add element ip t portip { 80-100: 10.0.0.1 } O add element ip t portip { 80-100 : 10.0.0.1 } diff --git a/tests/monitor/testcases/set-mixed.t b/tests/monitor/testcases/set-mixed.t index c4699eda..2eb35b5a 100644 --- a/tests/monitor/testcases/set-mixed.t +++ b/tests/monitor/testcases/set-mixed.t @@ -2,7 +2,7 @@ I add table ip t O add table ip t I add set ip t portrange { type inet_service; flags interval; } -O add set ip t portrange { type inet_service;flags interval } +O add set ip t portrange { type inet_service;flags interval; } I add set ip t ports { type inet_service; } O add set ip t ports { type inet_service;} diff --git a/tests/monitor/testcases/set-multiple.t b/tests/monitor/testcases/set-multiple.t index d94f941b..ce919125 100644 --- a/tests/monitor/testcases/set-multiple.t +++ b/tests/monitor/testcases/set-multiple.t @@ -2,9 +2,9 @@ I add table ip t O add table ip t I add set ip t portrange { type inet_service; flags interval; } -O add set ip t portrange { type inet_service;flags interval } +O add set ip t portrange { type inet_service;flags interval; } I add set ip t portrange2 { type inet_service; flags interval; } -O add set ip t portrange2 { type inet_service;flags interval } +O add set ip t portrange2 { type inet_service;flags interval; } # make sure concurrent adds work I add element ip t portrange { 1024-65535 } diff --git a/tests/monitor/testcases/set-simple.t b/tests/monitor/testcases/set-simple.t index 22f648db..e44cce08 100644 --- a/tests/monitor/testcases/set-simple.t +++ b/tests/monitor/testcases/set-simple.t @@ -2,7 +2,7 @@ I add table ip t O add table ip t I add set ip t portrange { type inet_service; flags interval; } -O add set ip t portrange { type inet_service;flags interval } +O add set ip t portrange { type inet_service;flags interval; } # adding some ranges I add element ip t portrange { 1-10 } |