diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2015-03-03 09:08:05 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-06-08 12:48:21 -0400 |
| commit | f03db93b27bc4221712a2f7ef6a123a144e5884c (patch) | |
| tree | bb275f9c7f4855c606dc94c629c9b329311618ec | |
| parent | 744f46853039088cd84b419068ae1978b552f584 (diff) | |
lib, vtysh: reduce unneccessary C extension usage
We're only supporting GCC, Clang and ICC; but there's no reason to use
nonstandard C constructs if they don't actually provide any benefit.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
(cherry picked from commit 71f55f38cb3dd804176e7f382f52b75ddcd437de)
| -rw-r--r-- | lib/buffer.c | 2 | ||||
| -rw-r--r-- | vtysh/vtysh_main.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/buffer.c b/lib/buffer.c index b689549ed6..ee9310100e 100644 --- a/lib/buffer.c +++ b/lib/buffer.c @@ -148,7 +148,7 @@ buffer_add (struct buffer *b) { struct buffer_data *d; - d = XMALLOC(MTYPE_BUFFER_DATA, offsetof(struct buffer_data, data[b->size])); + d = XMALLOC(MTYPE_BUFFER_DATA, offsetof(struct buffer_data, data) + b->size); d->cp = d->sp = 0; d->next = NULL; diff --git a/vtysh/vtysh_main.c b/vtysh/vtysh_main.c index 1d40ab4cca..667c88e576 100644 --- a/vtysh/vtysh_main.c +++ b/vtysh/vtysh_main.c @@ -231,9 +231,12 @@ static void log_it(const char *line) { time_t t = time(NULL); struct tm *tmp = localtime(&t); - const char *user = getenv("USER") ? : "boot"; + const char *user = getenv("USER"); char tod[64]; + if (!user) + user = "boot"; + strftime(tod, sizeof tod, "%Y%m%d-%H:%M.%S", tmp); fprintf(logfile, "%s:%s %s\n", tod, user, line); |