Merge pull request #11076 from routingrocks/vrrp_master_ad_cli

[mirror_frr.git] / lib / log.c

diff --git a/lib/log.c b/lib/log.c
index 936422104f95f7500025c674fa02410e52320ed0..5c453569ee345e8ce11d947f037af725c6da845a 100644 (file)
--- a/lib/log.c
+++ b/lib/log.c
@@ -64,7 +64,7 @@ const char *lookup_msg(const struct message *mz, int kz, const char *nf)
 }
 
 /* For time string format. */
-size_t quagga_timestamp(int timestamp_precision, char *buf, size_t buflen)
+size_t frr_timestamp(int timestamp_precision, char *buf, size_t buflen)
 {
        static struct {
                time_t last;
@@ -239,7 +239,7 @@ void zlog_backtrace(int priority)
 {
 #ifdef HAVE_LIBUNWIND
        char buf[100];
-       unw_cursor_t cursor;
+       unw_cursor_t cursor = {};
        unw_context_t uc;
        unw_word_t ip, off, sp;
        Dl_info dlinfo;
@@ -355,9 +355,6 @@ static const struct zebra_desc_table command_types[] = {
        DESC_ENTRY(ZEBRA_INTERFACE_NBR_ADDRESS_ADD),
        DESC_ENTRY(ZEBRA_INTERFACE_NBR_ADDRESS_DELETE),
        DESC_ENTRY(ZEBRA_INTERFACE_BFD_DEST_UPDATE),
-       DESC_ENTRY(ZEBRA_IMPORT_ROUTE_REGISTER),
-       DESC_ENTRY(ZEBRA_IMPORT_ROUTE_UNREGISTER),
-       DESC_ENTRY(ZEBRA_IMPORT_CHECK_UPDATE),
        DESC_ENTRY(ZEBRA_BFD_DEST_REGISTER),
        DESC_ENTRY(ZEBRA_BFD_DEST_DEREGISTER),
        DESC_ENTRY(ZEBRA_BFD_DEST_UPDATE),