*: 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>

1 files changed, 2 insertions, 3 deletions

diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c
index 772ba49f9..4c750faf4 100644
--- a/ripd/rip_interface.c
+++ b/ripd/rip_interface.c
@@ -86,8 +86,7 @@ ipv4_multicast_join (int sock,
 				   ifindex); 
 
   if (ret < 0) 
-    zlog (NULL, LOG_INFO, "can't setsockopt IP_ADD_MEMBERSHIP %s",
-	  safe_strerror (errno));
+    zlog_info("can't setsockopt IP_ADD_MEMBERSHIP %s", safe_strerror(errno));
 
   return ret;
 }
@@ -108,7 +107,7 @@ ipv4_multicast_leave (int sock,
 				   ifindex);
 
   if (ret < 0) 
-    zlog (NULL, LOG_INFO, "can't setsockopt IP_DROP_MEMBERSHIP");
+    zlog_info("can't setsockopt IP_DROP_MEMBERSHIP");
 
   return ret;
 }