Merge branch 'master' into 1.1

[meshlink] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index cae3a0fe93f218d19915e4a6ac0dd75b1588dbdd..50f6fe73050b269e712554f1e78a1f24929ab386 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -73,7 +73,7 @@ bool send_request(connection_t *c, const char *format, ...) {
 
        cp();
 
-       /* Use vsnprintf instead of vasprintf: faster, no memory
+       /* Use vsnprintf instead of vxasprintf: faster, no memory
           fragmentation, cleanup is automatic, and there is a limit on the
           input buffer anyway */
 
@@ -196,7 +196,7 @@ bool seen_request(char *request) {
                ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Already seen request"));
                return true;
        } else {
-               new = xmalloc(sizeof(*new));
+               new = xmalloc(sizeof *new);
                new->request = xstrdup(request);
                new->firstseen = time(NULL);
                splay_insert(past_request_tree, new);