bfdd: remove logging shim

This does exactly nothing, other than hiding format warnings...

Signed-off-by: David Lamparter <equinox@diac24.net>

diff --git a/bfdd/bfd.h b/bfdd/bfd.h
index 97702aab547df662300bdbcf3789c4549a92a948..2ae74d7880b1074e104e96ccd483ee0f65e4e1ae 100644 (file)
--- a/bfdd/bfd.h
+++ b/bfdd/bfd.h
@@ -427,27 +427,20 @@ void pl_free(struct peer_label *pl);
 
 
 /*
- * log.c
- *
- * Contains code that does the logging procedures. Might implement multiple
- * backends (e.g. zebra log, syslog or other logging lib).
+ * logging - alias to zebra log
  */
-enum blog_level {
-       /* level vs syslog equivalent */
-       BLOG_DEBUG = 0,   /* LOG_DEBUG */
-       BLOG_INFO = 1,    /* LOG_INFO */
-       BLOG_WARNING = 2, /* LOG_WARNING */
-       BLOG_ERROR = 3,   /* LOG_ERR */
-       BLOG_FATAL = 4,   /* LOG_CRIT */
-};
 
-void log_init(int foreground, enum blog_level level,
-             struct frr_daemon_info *fdi);
-void log_info(const char *fmt, ...);
-void log_debug(const char *fmt, ...);
-void log_warning(const char *fmt, ...);
-void log_error(const char *fmt, ...);
-void log_fatal(const char *fmt, ...);
+#define log_debug      zlog_debug
+#define log_info       zlog_info
+#define log_warning    zlog_warn
+#define log_error      zlog_err
+
+#define log_fatal(msg, ...)                                                    \
+       do {                                                                   \
+               zlog_err(msg, ## __VA_ARGS__);                                 \
+               assert(!msg);                                                  \
+               abort();                                                       \
+       } while (0)
 
 
 /*

diff --git a/bfdd/bfdd.c b/bfdd/bfdd.c
index 341edbe5cd3e9bebf3e673cb3600135a4fd31443..69f268ab016e811207c82b322145ea1945db5220 100644 (file)
--- a/bfdd/bfdd.c
+++ b/bfdd/bfdd.c
@@ -216,15 +216,12 @@ int main(int argc, char *argv[])
        parse_config(conf);
 #endif
 
-       /* Initialize logging API. */
-       log_init(1, BLOG_DEBUG, &bfdd_di);
+       /* Initialize FRR infrastructure. */
+       master = frr_init();
 
        /* Initialize control socket. */
        control_init(ctl_path);
 
-       /* Initialize FRR infrastructure. */
-       master = frr_init();
-
        /* Initialize BFD data structures. */
        bfd_initialize();
 

diff --git a/bfdd/log.c b/bfdd/log.c
deleted file mode 100644 (file)
index d81d7cd..0000000
--- a/bfdd/log.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*********************************************************************
- * Copyright 2017-2018 Network Device Education Foundation, Inc. ("NetDEF")
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * log.c: implements an abstraction between loggers interface. Implement all
- * log backends in this file.
- *
- * Authors
- * -------
- * Rafael Zalamena <rzalamena@opensourcerouting.org>
- */
-
-#include <zebra.h>
-
-#include "bfd.h"
-
-#include "lib/log_int.h"
-
-void log_msg(int level, const char *fmt, va_list vl);
-
-
-static int log_fg;
-static int log_level = BLOG_DEBUG;
-
-void log_init(int foreground, enum blog_level level,
-             struct frr_daemon_info *fdi)
-{
-       log_fg = foreground;
-       log_level = level;
-
-       openzlog(fdi->progname, fdi->logname, 0,
-                LOG_CONS | LOG_NDELAY | LOG_PID, LOG_DAEMON);
-}
-
-void log_msg(int level, const char *fmt, va_list vl)
-{
-       if (level < log_level)
-               return;
-
-       switch (level) {
-       case BLOG_DEBUG:
-               vzlog(LOG_DEBUG, fmt, vl);
-               break;
-
-       case BLOG_INFO:
-               vzlog(LOG_INFO, fmt, vl);
-               break;
-
-       case BLOG_WARNING:
-               vzlog(LOG_WARNING, fmt, vl);
-               break;
-
-       case BLOG_ERROR:
-               vzlog(LOG_ERR, fmt, vl);
-               break;
-
-       case BLOG_FATAL:
-               vzlog(LOG_EMERG, fmt, vl);
-               break;
-
-       default:
-               vfprintf(stderr, fmt, vl);
-               break;
-       }
-}
-
-void log_info(const char *fmt, ...)
-{
-       va_list vl;
-
-       va_start(vl, fmt);
-       log_msg(BLOG_INFO, fmt, vl);
-       va_end(vl);
-}
-
-void log_debug(const char *fmt, ...)
-{
-       va_list vl;
-
-       va_start(vl, fmt);
-       log_msg(BLOG_DEBUG, fmt, vl);
-       va_end(vl);
-}
-
-void log_error(const char *fmt, ...)
-{
-       va_list vl;
-
-       va_start(vl, fmt);
-       log_msg(BLOG_ERROR, fmt, vl);
-       va_end(vl);
-}
-
-void log_warning(const char *fmt, ...)
-{
-       va_list vl;
-
-       va_start(vl, fmt);
-       log_msg(BLOG_WARNING, fmt, vl);
-       va_end(vl);
-}
-
-void log_fatal(const char *fmt, ...)
-{
-       va_list vl;
-
-       va_start(vl, fmt);
-       log_msg(BLOG_FATAL, fmt, vl);
-       va_end(vl);
-
-       exit(1);
-}

diff --git a/bfdd/subdir.am b/bfdd/subdir.am
index 9aa522f3f076b31cfa6ddf7e17bb0d00be909379..254329e221aeec056ce49478b471a4d06ea3d980 100644 (file)
--- a/bfdd/subdir.am
+++ b/bfdd/subdir.am
@@ -22,7 +22,6 @@ bfdd_libbfd_a_SOURCES = \
        bfdd/config.c \
        bfdd/control.c \
        bfdd/event.c \
-       bfdd/log.c \
        bfdd/ptm_adapter.c \
        # end