lib, ospfd, ospf6d: fix logging of pointer addresses

The %p printf format specifier does already print the pointer address
with a leading "0x" prefix (indicating a hexadecimal number). There's
no need to add that prefix manually.

While here, replace explicit function names in log messages by
__func__.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>

diff --git a/lib/zclient.c b/lib/zclient.c
index 3ea1789441b857d150578e657ee9c7cfd6ca0d1b..365635a8da88f1e62a24f4c923e6e288381a0315 100644 (file)
--- a/lib/zclient.c
+++ b/lib/zclient.c
@@ -3666,9 +3666,8 @@ static int zclient_read(struct thread *thread)
        length -= ZEBRA_HEADER_SIZE;
 
        if (zclient_debug)
-               zlog_debug("zclient 0x%p command %s VRF %u",
-                          (void *)zclient, zserv_command_string(command),
-                          vrf_id);
+               zlog_debug("zclient %p command %s VRF %u", zclient,
+                          zserv_command_string(command), vrf_id);
 
        switch (command) {
        case ZEBRA_CAPABILITIES:

diff --git a/ospf6d/ospf6_lsa.c b/ospf6d/ospf6_lsa.c
index f5f429b041dc1bd372bc3c14686a0cdc552183b2..683e5ffc434145cbc911254b194ba9c60f214011 100644 (file)
--- a/ospf6d/ospf6_lsa.c
+++ b/ospf6d/ospf6_lsa.c
@@ -623,8 +623,8 @@ void ospf6_lsa_show_internal(struct vty *vty, struct ospf6_lsa *lsa,
                vty_out(vty, "Flag: %x \n", lsa->flag);
                vty_out(vty, "Lock: %d \n", lsa->lock);
                vty_out(vty, "ReTx Count: %d\n", lsa->retrans_count);
-               vty_out(vty, "Threads: Expire: 0x%p, Refresh: 0x%p \n",
-                       (void *)lsa->expire, (void *)lsa->refresh);
+               vty_out(vty, "Threads: Expire: %p, Refresh: %p\n", lsa->expire,
+                       lsa->refresh);
                vty_out(vty, "\n");
        }
        return;

diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c
index 72dc699bd989fd5ea5a47a6f4b35b35ec0e92e53..49829d86f1532efddc5946d5ffa80f28a6399cd1 100644 (file)
--- a/ospfd/ospf_lsa.c
+++ b/ospfd/ospf_lsa.c
@@ -2670,15 +2670,16 @@ struct ospf_lsa *ospf_lsa_install(struct ospf *ospf, struct ospf_interface *oi,
 
                        if (IS_DEBUG_OSPF(lsa, LSA_REFRESH)) {
                                zlog_debug(
-                                       "ospf_lsa_install() Premature Aging lsa 0x%p, seqnum 0x%x",
-                                       (void *)lsa,
+                                       "%s() Premature Aging lsa %p, seqnum 0x%x",
+                                       __func__, lsa,
                                        ntohl(lsa->data->ls_seqnum));
                                ospf_lsa_header_dump(lsa->data);
                        }
                } else {
                        if (IS_DEBUG_OSPF(lsa, LSA_GENERATE)) {
                                zlog_debug(
-                                       "ospf_lsa_install() got an lsa with seq 0x80000000 that was not self originated. Ignoring");
+                                       "%s() got an lsa with seq 0x80000000 that was not self originated. Ignoring",
+                                       __func__);
                                ospf_lsa_header_dump(lsa->data);
                        }
                        return old;
@@ -2764,9 +2765,8 @@ struct ospf_lsa *ospf_lsa_install(struct ospf *ospf, struct ospf_interface *oi,
         */
        if (IS_LSA_MAXAGE(new)) {
                if (IS_DEBUG_OSPF(lsa, LSA_INSTALL))
-                       zlog_debug("LSA[Type%d:%pI4]: Install LSA 0x%p, MaxAge",
-                                  new->data->type, &new->data->id,
-                                  (void *)lsa);
+                       zlog_debug("LSA[Type%d:%pI4]: Install LSA %p, MaxAge",
+                                  new->data->type, &new->data->id, lsa);
                ospf_lsa_maxage(ospf, lsa);
        }
 
@@ -2855,8 +2855,8 @@ static int ospf_maxage_lsa_remover(struct thread *thread)
                        if (CHECK_FLAG(lsa->flags, OSPF_LSA_PREMATURE_AGE)) {
                                if (IS_DEBUG_OSPF(lsa, LSA_FLOODING))
                                        zlog_debug(
-                                               "originating new lsa for lsa 0x%p",
-                                               (void *)lsa);
+                                               "originating new lsa for lsa %p",
+                                               lsa);
                                ospf_lsa_refresh(ospf, lsa);
                        }