Fix tabs

diff --git a/src/agent_priv.c b/src/agent_priv.c
index 021847bec6db7b005e1e84e541afeb70bf65769d..c055d341dec26a2c1dc54c2c841243c082a94ca5 100644 (file)
--- a/src/agent_priv.c
+++ b/src/agent_priv.c
@@ -47,7 +47,7 @@ agent_priv_unix_recv(netsnmp_transport *t, void *buf, int size,
        int rc = -1;
        socklen_t  tolen = sizeof(struct sockaddr_un);
        struct sockaddr *to = NULL;
-       
+
        if (t == NULL || t->sock < 0)
                goto recv_error;
        to = (struct sockaddr *)malloc(sizeof(struct sockaddr_un));
@@ -116,12 +116,13 @@ agent_priv_unix_transport(const char *string, int len, int local)
 {
        struct sockaddr_un addr;
        netsnmp_transport *t = NULL;
-
+       
        if (local) {
                LLOG_WARNX("should not have been called for local transport");
                return NULL;
        }
-       
+       if (!string)
+               return NULL;
        if (len > 0 && len < (sizeof(addr.sun_path) - 1)) {
                addr.sun_family = AF_UNIX;
                memset(addr.sun_path, 0, sizeof(addr.sun_path));
@@ -153,9 +154,9 @@ agent_priv_unix_transport(const char *string, int len, int local)
                agent_priv_unix_close(t);
                netsnmp_transport_free(t);
                return NULL;
-        }
-        memcpy(t->remote, addr.sun_path, strlen(addr.sun_path));
-        t->remote_length = strlen(addr.sun_path);
+       }
+       memcpy(t->remote, addr.sun_path, strlen(addr.sun_path));
+       t->remote_length = strlen(addr.sun_path);
 
        t->msgMaxSize = 0x7fffffff;
        t->f_recv     = agent_priv_unix_recv;
@@ -192,9 +193,7 @@ agent_priv_register_domain()
        unixDomain.name_length = sizeof(netsnmp_UnixDomain) / sizeof(oid);
        unixDomain.prefix = (const char**)calloc(2, sizeof(char *));
        unixDomain.prefix[0] = "unix";
-       
        unixDomain.f_create_from_tstring_new = agent_priv_unix_create_tstring;
        unixDomain.f_create_from_ostring = agent_priv_unix_create_ostring;
-       
        netsnmp_tdomain_register(&unixDomain);
 }

diff --git a/src/lldpd.c b/src/lldpd.c
index 812e82fb705bf3faa5058f30d9d950313285c887..f410861732e3e80375a40a9548276a7401910b2b 100644 (file)
--- a/src/lldpd.c
+++ b/src/lldpd.c
@@ -265,7 +265,7 @@ void
 lldpd_iface_multicast(struct lldpd *global, const char *name, int remove)
 {
        int i, rc;
-       
+
        for (i=0; global->g_protocols[i].mode != 0; i++) {
                if (!global->g_protocols[i].enabled) continue;
                if ((rc = priv_iface_multicast(name,

diff --git a/src/priv.c b/src/priv.c
index 82444e42255b051369b944b2c1c9e8c1fd9f410c..67ccb2c5fd9a2ef8bd7cf68aa3bbdb16bfa897de 100644 (file)
--- a/src/priv.c
+++ b/src/priv.c
@@ -382,8 +382,8 @@ asroot_iface_multicast()
                &ifr) < 0) {
                must_write(remote, &errno, sizeof(errno));
                return;
-               }
-       
+       }
+
        must_write(remote, &rc, sizeof(rc));
 }
 
@@ -554,7 +554,6 @@ priv_init(char *chrootdir)
                priv_loop();
                exit(0);
        }
-       
 }
 
 /* Stolen from sbin/pflogd/privsep.c from OpenBSD */