summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2013-11-22 21:58:43 +0100
committerOndrej Zajicek <santiago@crfreenet.org>2013-11-22 21:58:43 +0100
commit56027b5cbd7f432d30f7fc99bcf8680c840e6163 (patch)
tree271278d459a5d97c8911b842a02854230dfaca5c
parent1fba34a7a1e245f08212a31a65030230da8c451d (diff)
Minor fix in log_commit() w.r.t. changes in BFD branch.
-rw-r--r--filter/test.conf6
-rw-r--r--sysdep/unix/log.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/filter/test.conf b/filter/test.conf
index 62c807b7..ae8a95a6 100644
--- a/filter/test.conf
+++ b/filter/test.conf
@@ -267,7 +267,7 @@ pair set ps;
ec set ecs;
ip set ips;
prefix set pxs;
-string s;
+string st;
{
print "1a-a1 = 30: ", '1a-a1';
print "Testing filter language:";
@@ -352,8 +352,8 @@ string s;
print "Testing EC set, false: ", (ro, 10, 20) ~ ecs, " ", (rt, 10, 21) ~ ecs, " ", (ro, 100000, 99) ~ ecs,
" ", (ro, 12345, 10) ~ ecs, " ", (rt, 12346, 0) ~ ecs, " ", (ro, 0.1.134.160, 150) ~ ecs;
- s = "Hello";
- print "Testing string: ", s, " true: ", s ~ "Hell*", " false: ", s ~ "ell*";
+ st = "Hello";
+ print "Testing string: ", st, " true: ", st ~ "Hell*", " false: ", st ~ "ell*";
b = true;
print "Testing bool: ", b, ", ", !b;
diff --git a/sysdep/unix/log.c b/sysdep/unix/log.c
index 9dd4d66f..0f4c06e9 100644
--- a/sysdep/unix/log.c
+++ b/sysdep/unix/log.c
@@ -130,6 +130,8 @@ log_commit(int class, buffer *buf)
/* FIXME: cli_echo is not thread-safe */
cli_echo(class, buf->start);
+
+ buf->pos = buf->start;
}
int buffer_vprint(buffer *buf, const char *fmt, va_list args);