*: 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, 4 insertions, 4 deletions

diff --git a/ospfd/ospf_nsm.c b/ospfd/ospf_nsm.c
index ccb82bf8f..01617055c 100644
--- a/ospfd/ospf_nsm.c
+++ b/ospfd/ospf_nsm.c
@@ -63,8 +63,8 @@ ospf_inactivity_timer (struct thread *thread)
   nbr->t_inactivity = NULL;
 
   if (IS_DEBUG_OSPF (nsm, NSM_TIMERS))
-    zlog (NULL, LOG_DEBUG, "NSM[%s:%s]: Timer (Inactivity timer expire)",
-	  IF_NAME (nbr->oi), inet_ntoa (nbr->router_id));
+    zlog_debug("NSM[%s:%s]: Timer (Inactivity timer expire)",
+               IF_NAME(nbr->oi), inet_ntoa(nbr->router_id));
 
   OSPF_NSM_EVENT_SCHEDULE (nbr, NSM_InactivityTimer);
 
@@ -80,8 +80,8 @@ ospf_db_desc_timer (struct thread *thread)
   nbr->t_db_desc = NULL;
 
   if (IS_DEBUG_OSPF (nsm, NSM_TIMERS))
-    zlog (NULL, LOG_DEBUG, "NSM[%s:%s]: Timer (DD Retransmit timer expire)",
-	  IF_NAME (nbr->oi), inet_ntoa (nbr->src));
+    zlog_debug("NSM[%s:%s]: Timer (DD Retransmit timer expire)",
+               IF_NAME(nbr->oi), inet_ntoa(nbr->src));
 
   /* resent last send DD packet. */
   assert (nbr->last_send);