Browse Source

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>
David Lamparter 4 years ago
parent
commit
71f55f38cb
2 changed files with 5 additions and 2 deletions
  1. 1 1
      lib/buffer.c
  2. 4 1
      vtysh/vtysh_main.c

+ 1 - 1
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;
 

+ 4 - 1
vtysh/vtysh_main.c

@@ -202,9 +202,12 @@ static void log_it(const char *line)
 {
   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);