diff options
| author | Renato Westphal <renato@opensourcerouting.org> | 2021-05-31 15:27:51 +0200 |
|---|---|---|
| committer | Renato Westphal <renato@opensourcerouting.org> | 2021-06-08 16:50:44 +0200 |
| commit | 461d106dae75e4fc449ff0565040b1d268d75f23 (patch) | |
| tree | ede3befd98b7e9e7f6ac70cd354ec6d8c0c2f372 /ospfd | |
| parent | ospfd: fix wrong NSSA debug guards (diff) | |
| download | frr-461d106dae75e4fc449ff0565040b1d268d75f23.tar.xz frr-461d106dae75e4fc449ff0565040b1d268d75f23.zip | |
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>
Diffstat (limited to 'ospfd')
| -rw-r--r-- | ospfd/ospf_lsa.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c index 72dc699bd..49829d86f 100644 --- 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); } |