*: get rid of zlog(*, LOG_LEVEL, ...)

Result of running the following Coccinelle patch + fixups:
<<EOF
/* long-forms: zlog(NULL, <level>, ...)
 *    =>       zlog_level(...)
 */

@@
expression list args;
@@
- zlog(NULL, LOG_DEBUG, args)
+ zlog_debug(args)

@@
expression list args;
@@
- zlog(NULL, LOG_NOTICE, args)
+ zlog_notice(args)

@@
expression list args;
@@
- zlog(NULL, LOG_INFO, args)
+ zlog_info(args)

@@
expression list args;
@@
- zlog(NULL, LOG_WARNING, args)
+ zlog_warn(args)

@@
expression list args;
@@
- zlog(NULL, LOG_ERR, args)
+ zlog_err(args)

/* long-forms: zlog(base->log, <level>, ...)
 *    =>       zlog_level(...)
 */

@@
expression base;
expression list args;
@@
- zlog(base->log, LOG_DEBUG, args)
+ zlog_debug(args)

@@
expression base;
expression list args;
@@
- zlog(base->log, LOG_NOTICE, args)
+ zlog_notice(args)

@@
expression base;
expression list args;
@@
- zlog(base->log, LOG_INFO, args)
+ zlog_info(args)

@@
expression base;
expression list args;
@@
- zlog(base->log, LOG_WARNING, args)
+ zlog_warn(args)

@@
expression base;
expression list args;
@@
- zlog(base->log, LOG_ERR, args)
+ zlog_err(args)

EOF

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

9 files changed, 75 insertions, 84 deletions

diff --git a/zebra/if_ioctl_solaris.c b/zebra/if_ioctl_solaris.c
index f27dc89007..339e00b22c 100644
--- a/zebra/if_ioctl_solaris.c
+++ b/zebra/if_ioctl_solaris.c
@@ -59,7 +59,7 @@ interface_list_ioctl (int af)
   char *buf = NULL;
 
   if (zserv_privs.change(ZPRIVS_RAISE))
-    zlog (NULL, LOG_ERR, "Can't raise privileges");
+    zlog_err("Can't raise privileges");
   
   sock = socket (af, SOCK_DGRAM, 0);
   if (sock < 0)
@@ -68,7 +68,7 @@ interface_list_ioctl (int af)
                  (af == AF_INET ? "AF_INET" : "AF_INET6"), safe_strerror (errno));
                  
       if (zserv_privs.change(ZPRIVS_LOWER))
-        zlog (NULL, LOG_ERR, "Can't lower privileges");
+        zlog_err("Can't lower privileges");
         
       return -1;
     }
@@ -80,7 +80,7 @@ calculate_lifc_len:     /* must hold privileges to enter here */
   save_errno = errno;
   
   if (zserv_privs.change(ZPRIVS_LOWER))
-    zlog (NULL, LOG_ERR, "Can't lower privileges");
+    zlog_err("Can't lower privileges");
  
   if (ret < 0)
     {
@@ -117,7 +117,7 @@ calculate_lifc_len:     /* must hold privileges to enter here */
   lifconf.lifc_buf = buf;
 
   if (zserv_privs.change(ZPRIVS_RAISE))
-    zlog (NULL, LOG_ERR, "Can't raise privileges");
+    zlog_err("Can't raise privileges");
     
   ret = ioctl (sock, SIOCGLIFCONF, &lifconf);
 
@@ -129,13 +129,13 @@ calculate_lifc_len:     /* must hold privileges to enter here */
       zlog_warn ("SIOCGLIFCONF: %s", safe_strerror (errno));
 
       if (zserv_privs.change(ZPRIVS_LOWER))
-        zlog (NULL, LOG_ERR, "Can't lower privileges");
+        zlog_err("Can't lower privileges");
 
       goto end;
     }
 
   if (zserv_privs.change(ZPRIVS_LOWER))
-    zlog (NULL, LOG_ERR, "Can't lower privileges");
+    zlog_err("Can't lower privileges");
     
   /* Allocate interface. */
   lifreq = lifconf.lifc_req;
diff --git a/zebra/if_sysctl.c b/zebra/if_sysctl.c
index 0b71c76214..8326f0e396 100644
--- a/zebra/if_sysctl.c
+++ b/zebra/if_sysctl.c
@@ -69,7 +69,7 @@ ifstat_update_sysctl (void)
   /* Fetch interface informations into allocated buffer. */
   if (sysctl (mib, MIBSIZ, buf, &bufsiz, NULL, 0) < 0) 
     {
-      zlog (NULL, LOG_WARNING, "sysctl error by %s", safe_strerror (errno));
+      zlog_warn("sysctl error by %s", safe_strerror(errno));
       XFREE(MTYPE_TMP, ref);
       return;
     }
@@ -120,7 +120,7 @@ interface_list (struct zebra_ns *zns)
   /* Query buffer size. */
   if (sysctl (mib, MIBSIZ, NULL, &bufsiz, NULL, 0) < 0) 
     {
-      zlog (NULL, LOG_WARNING, "sysctl() error by %s", safe_strerror (errno));
+      zlog_warn("sysctl() error by %s", safe_strerror(errno));
       return;
     }
 
@@ -130,7 +130,7 @@ interface_list (struct zebra_ns *zns)
   /* Fetch interface informations into allocated buffer. */
   if (sysctl (mib, MIBSIZ, buf, &bufsiz, NULL, 0) < 0) 
     {
-      zlog (NULL, LOG_WARNING, "sysctl error by %s", safe_strerror (errno));
+      zlog_warn("sysctl error by %s", safe_strerror(errno));
       return;
     }
 
diff --git a/zebra/ioctl.c b/zebra/ioctl.c
index 1125043310..dfd69300f9 100644
--- a/zebra/ioctl.c
+++ b/zebra/ioctl.c
@@ -56,20 +56,20 @@ if_ioctl (u_long request, caddr_t buffer)
   int err = 0;
 
   if (zserv_privs.change(ZPRIVS_RAISE))
-    zlog (NULL, LOG_ERR, "Can't raise privileges");
+    zlog_err("Can't raise privileges");
   sock = socket (AF_INET, SOCK_DGRAM, 0);
   if (sock < 0)
     {
       int save_errno = errno;
       if (zserv_privs.change(ZPRIVS_LOWER))
-        zlog (NULL, LOG_ERR, "Can't lower privileges");
+        zlog_err("Can't lower privileges");
       zlog_err("Cannot create UDP socket: %s", safe_strerror(save_errno));
       exit (1);
     }
   if ((ret = ioctl (sock, request, buffer)) < 0)
     err = errno;
   if (zserv_privs.change(ZPRIVS_LOWER))
-    zlog (NULL, LOG_ERR, "Can't lower privileges");
+    zlog_err("Can't lower privileges");
   close (sock);
   
   if (ret < 0) 
@@ -88,13 +88,13 @@ if_ioctl_ipv6 (u_long request, caddr_t buffer)
   int err = 0;
 
   if (zserv_privs.change(ZPRIVS_RAISE))
-    zlog (NULL, LOG_ERR, "Can't raise privileges");
+    zlog_err("Can't raise privileges");
   sock = socket (AF_INET6, SOCK_DGRAM, 0);
   if (sock < 0)
     {
       int save_errno = errno;
       if (zserv_privs.change(ZPRIVS_LOWER))
-        zlog (NULL, LOG_ERR, "Can't lower privileges");
+        zlog_err("Can't lower privileges");
       zlog_err("Cannot create IPv6 datagram socket: %s",
 	       safe_strerror(save_errno));
       exit (1);
@@ -103,7 +103,7 @@ if_ioctl_ipv6 (u_long request, caddr_t buffer)
   if ((ret = ioctl (sock, request, buffer)) < 0)
     err = errno;
   if (zserv_privs.change(ZPRIVS_LOWER))
-    zlog (NULL, LOG_ERR, "Can't lower privileges");
+    zlog_err("Can't lower privileges");
   close (sock);
   
   if (ret < 0) 
@@ -162,7 +162,7 @@ if_get_mtu (struct interface *ifp)
   zebra_interface_up_update(ifp);
 
 #else
-  zlog (NULL, LOG_INFO, "Can't lookup mtu on this system");
+  zlog_info("Can't lookup mtu on this system");
   ifp->mtu6 = ifp->mtu = -1;
 #endif
 }
diff --git a/zebra/ioctl_solaris.c b/zebra/ioctl_solaris.c
index 1de583577d..78796a8a28 100644
--- a/zebra/ioctl_solaris.c
+++ b/zebra/ioctl_solaris.c
@@ -53,14 +53,14 @@ if_ioctl (u_long request, caddr_t buffer)
   int err;
 
   if (zserv_privs.change(ZPRIVS_RAISE))
-    zlog (NULL, LOG_ERR, "Can't raise privileges");
+    zlog_err("Can't raise privileges");
     
   sock = socket (AF_INET, SOCK_DGRAM, 0);
   if (sock < 0)
     {
       int save_errno = errno;
       if (zserv_privs.change(ZPRIVS_LOWER))
-        zlog (NULL, LOG_ERR, "Can't lower privileges");
+        zlog_err("Can't lower privileges");
       zlog_err("Cannot create UDP socket: %s", safe_strerror(save_errno));
       exit (1);
     }
@@ -69,7 +69,7 @@ if_ioctl (u_long request, caddr_t buffer)
     err = errno;
   
   if (zserv_privs.change(ZPRIVS_LOWER))
-    zlog (NULL, LOG_ERR, "Can't lower privileges");
+    zlog_err("Can't lower privileges");
 
   close (sock);
 
@@ -90,14 +90,14 @@ if_ioctl_ipv6 (u_long request, caddr_t buffer)
   int err;
 
   if (zserv_privs.change(ZPRIVS_RAISE))
-    zlog (NULL, LOG_ERR, "Can't raise privileges");
+    zlog_err("Can't raise privileges");
 
   sock = socket (AF_INET6, SOCK_DGRAM, 0);
   if (sock < 0)
     {
       int save_errno = errno;
       if (zserv_privs.change(ZPRIVS_LOWER))
-        zlog (NULL, LOG_ERR, "Can't lower privileges");
+        zlog_err("Can't lower privileges");
       zlog_err("Cannot create IPv6 datagram socket: %s",
 	       safe_strerror(save_errno));
       exit (1);
@@ -107,7 +107,7 @@ if_ioctl_ipv6 (u_long request, caddr_t buffer)
     err = errno;
 
   if (zserv_privs.change(ZPRIVS_LOWER))
-    zlog (NULL, LOG_ERR, "Can't lower privileges");
+    zlog_err("Can't lower privileges");
 
   close (sock);
 
diff --git a/zebra/ipforward_sysctl.c b/zebra/ipforward_sysctl.c
index be4c9cd99c..28894f4e0a 100644
--- a/zebra/ipforward_sysctl.c
+++ b/zebra/ipforward_sysctl.c
@@ -61,16 +61,16 @@ ipforward_on (void)
 
   len = sizeof ipforwarding;
   if (zserv_privs.change(ZPRIVS_RAISE))
-    zlog (NULL, LOG_ERR, "Can't raise privileges");
+    zlog_err("Can't raise privileges");
   if (sysctl (mib, MIB_SIZ, NULL, NULL, &ipforwarding, len) < 0)
     {
       if (zserv_privs.change(ZPRIVS_LOWER))
-        zlog (NULL, LOG_ERR, "Can't lower privileges");
+        zlog_err("Can't lower privileges");
       zlog_warn ("Can't set ipforwarding on");
       return -1;
     }
   if (zserv_privs.change(ZPRIVS_LOWER))
-    zlog (NULL, LOG_ERR, "Can't lower privileges");
+    zlog_err("Can't lower privileges");
   return ipforwarding;
 }
 
@@ -82,16 +82,16 @@ ipforward_off (void)
 
   len = sizeof ipforwarding;
   if (zserv_privs.change(ZPRIVS_RAISE))
-    zlog (NULL, LOG_ERR, "Can't raise privileges");
+    zlog_err("Can't raise privileges");
   if (sysctl (mib, MIB_SIZ, NULL, NULL, &ipforwarding, len) < 0)
     {
       if (zserv_privs.change(ZPRIVS_LOWER))
-        zlog (NULL, LOG_ERR, "Can't lower privileges");
+        zlog_err("Can't lower privileges");
       zlog_warn ("Can't set ipforwarding on");
       return -1;
     }
   if (zserv_privs.change(ZPRIVS_LOWER))
-    zlog (NULL, LOG_ERR, "Can't lower privileges");
+    zlog_err("Can't lower privileges");
   return ipforwarding;
 }
 
@@ -117,16 +117,16 @@ ipforward_ipv6 (void)
 
   len = sizeof ip6forwarding;
   if (zserv_privs.change(ZPRIVS_RAISE))
-    zlog (NULL, LOG_ERR, "Can't raise privileges");
+    zlog_err("Can't raise privileges");
   if (sysctl (mib_ipv6, MIB_SIZ, &ip6forwarding, &len, 0, 0) < 0)
     {
      if (zserv_privs.change(ZPRIVS_LOWER))
-        zlog (NULL, LOG_ERR, "Can't lower privileges");
+        zlog_err("Can't lower privileges");
       zlog_warn ("can't get ip6forwarding value");
       return -1;
     }
   if (zserv_privs.change(ZPRIVS_LOWER))
-    zlog (NULL, LOG_ERR, "Can't lower privileges");
+    zlog_err("Can't lower privileges");
   return ip6forwarding;
 }
 
@@ -138,16 +138,16 @@ ipforward_ipv6_on (void)
 
   len = sizeof ip6forwarding;
   if (zserv_privs.change(ZPRIVS_RAISE))
-    zlog (NULL, LOG_ERR, "Can't raise privileges");
+    zlog_err("Can't raise privileges");
   if (sysctl (mib_ipv6, MIB_SIZ, NULL, NULL, &ip6forwarding, len) < 0)
     {
      if (zserv_privs.change(ZPRIVS_LOWER))
-        zlog (NULL, LOG_ERR, "Can't lower privileges");
+        zlog_err("Can't lower privileges");
       zlog_warn ("can't get ip6forwarding value");
       return -1;
     }
   if (zserv_privs.change(ZPRIVS_LOWER))
-    zlog (NULL, LOG_ERR, "Can't lower privileges");
+    zlog_err("Can't lower privileges");
   return ip6forwarding;
 }
 
@@ -159,15 +159,15 @@ ipforward_ipv6_off (void)
 
   len = sizeof ip6forwarding;
   if (zserv_privs.change(ZPRIVS_RAISE))
-    zlog (NULL, LOG_ERR, "Can't raise privileges");
+    zlog_err("Can't raise privileges");
   if (sysctl (mib_ipv6, MIB_SIZ, NULL, NULL, &ip6forwarding, len) < 0)
     {
       if (zserv_privs.change(ZPRIVS_LOWER))
-        zlog (NULL, LOG_ERR, "Can't lower privileges");
+        zlog_err("Can't lower privileges");
       zlog_warn ("can't get ip6forwarding value");
       return -1;
     }
   if (zserv_privs.change(ZPRIVS_LOWER))
-    zlog (NULL, LOG_ERR, "Can't lower privileges");
+    zlog_err("Can't lower privileges");
   return ip6forwarding;
 }
diff --git a/zebra/kernel_netlink.c b/zebra/kernel_netlink.c
index c9c2d90eac..49394bd6f8 100644
--- a/zebra/kernel_netlink.c
+++ b/zebra/kernel_netlink.c
@@ -143,8 +143,8 @@ netlink_recvbuf (struct nlsock *nl, uint32_t newsize)
   ret = getsockopt(nl->sock, SOL_SOCKET, SO_RCVBUF, &oldsize, &oldlen);
   if (ret < 0)
     {
-      zlog (NULL, LOG_ERR, "Can't get %s receive buffer size: %s", nl->name,
-	    safe_strerror (errno));
+      zlog_err("Can't get %s receive buffer size: %s", nl->name,
+               safe_strerror(errno));
       return -1;
     }
 
@@ -160,22 +160,21 @@ netlink_recvbuf (struct nlsock *nl, uint32_t newsize)
 		      sizeof(nl_rcvbufsize));
   if (ret < 0)
     {
-      zlog (NULL, LOG_ERR, "Can't set %s receive buffer size: %s", nl->name,
-	    safe_strerror (errno));
+      zlog_err("Can't set %s receive buffer size: %s", nl->name,
+               safe_strerror(errno));
       return -1;
     }
 
   ret = getsockopt(nl->sock, SOL_SOCKET, SO_RCVBUF, &newsize, &newlen);
   if (ret < 0)
     {
-      zlog (NULL, LOG_ERR, "Can't get %s receive buffer size: %s", nl->name,
-	    safe_strerror (errno));
+      zlog_err("Can't get %s receive buffer size: %s", nl->name,
+               safe_strerror(errno));
       return -1;
     }
 
-  zlog (NULL, LOG_INFO,
-	"Setting netlink socket receive buffer size: %u -> %u",
-	oldsize, newsize);
+  zlog_info("Setting netlink socket receive buffer size: %u -> %u", oldsize,
+            newsize);
   return 0;
 }
 
@@ -191,15 +190,14 @@ netlink_socket (struct nlsock *nl, unsigned long groups, ns_id_t ns_id)
 
   if (zserv_privs.change (ZPRIVS_RAISE))
     {
-      zlog (NULL, LOG_ERR, "Can't raise privileges");
+      zlog_err("Can't raise privileges");
       return -1;
     }
 
   sock = socket (AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
   if (sock < 0)
     {
-      zlog (NULL, LOG_ERR, "Can't open %s socket: %s", nl->name,
-            safe_strerror (errno));
+      zlog_err("Can't open %s socket: %s", nl->name, safe_strerror(errno));
       return -1;
     }
 
@@ -211,12 +209,12 @@ netlink_socket (struct nlsock *nl, unsigned long groups, ns_id_t ns_id)
   ret = bind (sock, (struct sockaddr *) &snl, sizeof snl);
   save_errno = errno;
   if (zserv_privs.change (ZPRIVS_LOWER))
-    zlog (NULL, LOG_ERR, "Can't lower privileges");
+    zlog_err("Can't lower privileges");
 
   if (ret < 0)
     {
-      zlog (NULL, LOG_ERR, "Can't bind %s socket to group 0x%x: %s",
-            nl->name, snl.nl_groups, safe_strerror (save_errno));
+      zlog_err("Can't bind %s socket to group 0x%x: %s", nl->name,
+               snl.nl_groups, safe_strerror(save_errno));
       close (sock);
       return -1;
     }
@@ -226,8 +224,7 @@ netlink_socket (struct nlsock *nl, unsigned long groups, ns_id_t ns_id)
   ret = getsockname (sock, (struct sockaddr *) &snl, (socklen_t *) &namelen);
   if (ret < 0 || namelen != sizeof snl)
     {
-      zlog (NULL, LOG_ERR, "Can't get %s socket name: %s", nl->name,
-            safe_strerror (errno));
+      zlog_err("Can't get %s socket name: %s", nl->name, safe_strerror(errno));
       close (sock);
       return -1;
     }
@@ -244,7 +241,7 @@ netlink_information_fetch (struct sockaddr_nl *snl, struct nlmsghdr *h,
   /* JF: Ignore messages that aren't from the kernel */
   if ( snl->nl_pid != 0 )
     {
-      zlog ( NULL, LOG_ERR, "Ignoring message from pid %u", snl->nl_pid );
+      zlog_err("Ignoring message from pid %u", snl->nl_pid);
       return 0;
     }
 
@@ -493,8 +490,7 @@ netlink_parse_info (int (*filter) (struct sockaddr_nl *, struct nlmsghdr *,
             continue;
           if (errno == EWOULDBLOCK || errno == EAGAIN)
             break;
-          zlog (NULL, LOG_ERR, "%s recvmsg overrun: %s",
-                nl->name, safe_strerror(errno));
+          zlog_err("%s recvmsg overrun: %s", nl->name, safe_strerror(errno));
           /*
            *  In this case we are screwed.
            *  There is no good way to
@@ -506,14 +502,14 @@ netlink_parse_info (int (*filter) (struct sockaddr_nl *, struct nlmsghdr *,
 
       if (status == 0)
         {
-          zlog (NULL, LOG_ERR, "%s EOF", nl->name);
+          zlog_err("%s EOF", nl->name);
           return -1;
         }
 
       if (msg.msg_namelen != sizeof snl)
         {
-          zlog (NULL, LOG_ERR, "%s sender address length error: length %d",
-                nl->name, msg.msg_namelen);
+          zlog_err("%s sender address length error: length %d", nl->name,
+                   msg.msg_namelen);
           return -1;
         }
 
@@ -558,8 +554,7 @@ netlink_parse_info (int (*filter) (struct sockaddr_nl *, struct nlmsghdr *,
 
               if (h->nlmsg_len < NLMSG_LENGTH (sizeof (struct nlmsgerr)))
                 {
-                  zlog (NULL, LOG_ERR, "%s error: message truncated",
-                        nl->name);
+                  zlog_err("%s error: message truncated", nl->name);
                   return -1;
                 }
 
@@ -627,7 +622,7 @@ netlink_parse_info (int (*filter) (struct sockaddr_nl *, struct nlmsghdr *,
           error = (*filter) (&snl, h, zns->ns_id, startup);
           if (error < 0)
             {
-              zlog (NULL, LOG_ERR, "%s filter function error", nl->name);
+              zlog_err("%s filter function error", nl->name);
               ret = error;
             }
         }
@@ -635,13 +630,12 @@ netlink_parse_info (int (*filter) (struct sockaddr_nl *, struct nlmsghdr *,
       /* After error care. */
       if (msg.msg_flags & MSG_TRUNC)
         {
-          zlog (NULL, LOG_ERR, "%s error: message truncated", nl->name);
+          zlog_err("%s error: message truncated", nl->name);
           continue;
         }
       if (status)
         {
-          zlog (NULL, LOG_ERR, "%s error: data remnant size %d", nl->name,
-                status);
+          zlog_err("%s error: data remnant size %d", nl->name, status);
           return -1;
         }
     }
@@ -696,11 +690,11 @@ netlink_talk (int (*filter) (struct sockaddr_nl *, struct nlmsghdr *,
 
   /* Send message to netlink interface. */
   if (zserv_privs.change (ZPRIVS_RAISE))
-    zlog (NULL, LOG_ERR, "Can't raise privileges");
+    zlog_err("Can't raise privileges");
   status = sendmsg (nl->sock, &msg, 0);
   save_errno = errno;
   if (zserv_privs.change (ZPRIVS_LOWER))
-    zlog (NULL, LOG_ERR, "Can't lower privileges");
+    zlog_err("Can't lower privileges");
 
   if (IS_ZEBRA_DEBUG_KERNEL_MSGDUMP_SEND)
     {
@@ -710,8 +704,7 @@ netlink_talk (int (*filter) (struct sockaddr_nl *, struct nlmsghdr *,
 
   if (status < 0)
     {
-      zlog (NULL, LOG_ERR, "netlink_talk sendmsg() error: %s",
-            safe_strerror (save_errno));
+      zlog_err("netlink_talk sendmsg() error: %s", safe_strerror(save_errno));
       return -1;
     }
 
@@ -740,7 +733,7 @@ netlink_request (int family, int type, struct nlsock *nl)
   /* Check netlink socket. */
   if (nl->sock < 0)
     {
-      zlog (NULL, LOG_ERR, "%s socket isn't active.", nl->name);
+      zlog_err("%s socket isn't active.", nl->name);
       return -1;
     }
 
@@ -760,7 +753,7 @@ netlink_request (int family, int type, struct nlsock *nl)
    */
   if (zserv_privs.change (ZPRIVS_RAISE))
     {
-      zlog (NULL, LOG_ERR, "Can't raise privileges");
+      zlog_err("Can't raise privileges");
       return -1;
     }
 
@@ -769,12 +762,11 @@ netlink_request (int family, int type, struct nlsock *nl)
   save_errno = errno;
 
   if (zserv_privs.change (ZPRIVS_LOWER))
-    zlog (NULL, LOG_ERR, "Can't lower privileges");
+    zlog_err("Can't lower privileges");
 
   if (ret < 0)
     {
-      zlog (NULL, LOG_ERR, "%s sendto failed: %s", nl->name,
-            safe_strerror (save_errno));
+      zlog_err("%s sendto failed: %s", nl->name, safe_strerror(save_errno));
       return -1;
     }
 
diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c
index 20a0472195..1bb85a31ab 100644
--- a/zebra/kernel_socket.c
+++ b/zebra/kernel_socket.c
@@ -826,9 +826,8 @@ rtm_read_mesg (struct rt_msghdr *rtm,
 
   /* rt_msghdr version check. */
   if (rtm->rtm_version != RTM_VERSION) 
-      zlog (NULL, LOG_WARNING,
-	      "Routing message version different %d should be %d."
-	      "This may cause problem\n", rtm->rtm_version, RTM_VERSION);
+      zlog_warn("Routing message version different %d should be %d." "This may cause problem\n",
+                rtm->rtm_version, RTM_VERSION);
   
   /* Be sure structure is cleared */
   memset (dest, 0, sizeof (union sockunion));
@@ -852,7 +851,7 @@ rtm_read_mesg (struct rt_msghdr *rtm,
 
   /* Assert read up to the end of pointer. */
   if (pnt != end) 
-      zlog (NULL, LOG_WARNING, "rtm_read() doesn't read all socket data.");
+      zlog_warn("rtm_read() doesn't read all socket data.");
 
   return rtm->rtm_flags;
 }
diff --git a/zebra/rt_socket.c b/zebra/rt_socket.c
index a4cc4eed06..de8cc69a8e 100644
--- a/zebra/rt_socket.c
+++ b/zebra/rt_socket.c
@@ -398,12 +398,12 @@ kernel_route_rib (struct prefix *p, struct prefix *src_p,
 
   if (src_p && src_p->prefixlen)
     {
-      zlog (NULL, LOG_ERR, "route add: IPv6 sourcedest routes unsupported!");
+      zlog_err ("route add: IPv6 sourcedest routes unsupported!");
       return 1;
     }
 
   if (zserv_privs.change(ZPRIVS_RAISE))
-    zlog (NULL, LOG_ERR, "Can't raise privileges");
+    zlog_err("Can't raise privileges");
 
   if (old)
     route |= kernel_rtm (RTM_DELETE, p, old);
@@ -412,7 +412,7 @@ kernel_route_rib (struct prefix *p, struct prefix *src_p,
     route |= kernel_rtm (RTM_ADD, p, new);
 
   if (zserv_privs.change(ZPRIVS_LOWER))
-    zlog (NULL, LOG_ERR, "Can't lower privileges");
+    zlog_err("Can't lower privileges");
 
   return route;
 }
diff --git a/zebra/zserv.c b/zebra/zserv.c
index 60364410a8..064489acd9 100644
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -2169,7 +2169,7 @@ zebra_serv ()
   sockopt_reuseport (accept_sock);
 
   if ( zserv_privs.change(ZPRIVS_RAISE) )
-    zlog (NULL, LOG_ERR, "Can't raise privileges");
+    zlog_err("Can't raise privileges");
     
   ret  = bind (accept_sock, (struct sockaddr *)&addr, 
 	       sizeof (struct sockaddr_in));
@@ -2183,7 +2183,7 @@ zebra_serv ()
     }
     
   if ( zserv_privs.change(ZPRIVS_LOWER) )
-    zlog (NULL, LOG_ERR, "Can't lower privileges");
+    zlog_err("Can't lower privileges");
 
   ret = listen (accept_sock, 1);
   if (ret < 0)