commit 71f55f38cb3dd804176e7f382f52b75ddcd437de
author David Lamparter <equinox@opensourcerouting.org> Tue Mar 03 09:08:05 2015 +0100
committer David Lamparter <equinox@opensourcerouting.org> Tue Apr 21 10:18:48 2015 +0200
tree 59f028f69361edb116ffeb862c6ead5a7cfb7d5d
parent fd8f6ebb4c6b9e5364b98d2b5fd345d1dcc08824

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>

lib/buffer.c

diff --git a/lib/buffer.c b/lib/buffer.c
index b689549..ee93101 100644
--- a/lib/buffer.c
+++ b/lib/buffer.c
@@ -148,7 +148,7 @@
 {
   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;
 

vtysh/vtysh_main.c

diff --git a/vtysh/vtysh_main.c b/vtysh/vtysh_main.c
index 48958f0..893c1a1 100644
--- a/vtysh/vtysh_main.c
+++ b/vtysh/vtysh_main.c
@@ -202,9 +202,12 @@
 {
   time_t t = time(NULL);
   struct tm *tmp = localtime(&t);
-  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);