Module: kamailio Branch: 5.5 Commit: 0a945faa496a48377c766f5966243b3e0a9dbc75 URL: https://github.com/kamailio/kamailio/commit/0a945faa496a48377c766f5966243b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T10:14:52+01:00 blst: converted log macros and removed function names (cherry picked from commit f85cd7eb9d3249ee93f0de7f978d0a9e7044df77) --- Modified: src/modules/blst/blst.c --- Diff: https://github.com/kamailio/kamailio/commit/0a945faa496a48377c766f5966243b3… Patch: https://github.com/kamailio/kamailio/commit/0a945faa496a48377c766f5966243b3… --- diff --git a/src/modules/blst/blst.c b/src/modules/blst/blst.c index 5d33368bd8..1c2773c53c 100644 --- a/src/modules/blst/blst.c +++ b/src/modules/blst/blst.c @@ -119,11 +119,10 @@ static int ki_blst_add(sip_msg_t* msg, int t) S_TO_TICKS(t)); return 1; }else{ - LOG(L_WARN, "WARNING: blst: blst_add: blocklist support disabled\n"); + LM_WARN("blocklist support disabled\n"); } #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_add: blocklist support not compiled-in" - " - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -193,12 +192,10 @@ static int ki_blst_add_retry_after(sip_msg_t* msg, int t_min, int t_max) S_TO_TICKS(t)); return 1; }else{ - LOG(L_WARN, "WARNING: blst: blst_add_retry_after:" - " blocklist support disabled\n"); + LM_WARN("blocklist support disabled\n"); } #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_add_retry_after:" - " blocklist support not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -241,11 +238,10 @@ static int ki_blst_del(sip_msg_t* msg) if (dst_blocklist_del(&src, msg)) return 1; }else{ - LOG(L_WARN, "WARNING: blst: blst_del: blocklist support disabled\n"); + LM_WARN("blocklist support disabled\n"); } #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_del: blocklist support not compiled-in" - " - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return -1; } @@ -281,8 +277,7 @@ static int ki_blst_is_blocklisted(sip_msg_t* msg) " blocklist support disabled\n"); } #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_is_blocklisted:" - " blocklist support not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return -1; } @@ -309,8 +304,7 @@ static int ki_blst_set_ignore(sip_msg_t* msg, int mask) msg->fwd_send_flags.blst_imask|=blst_imask; return 1; #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_ignore_req: blocklist support" - " not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -349,8 +343,7 @@ static int ki_blst_clear_ignore(sip_msg_t* msg, int mask) msg->fwd_send_flags.blst_imask&=~blst_imask; return 1; #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_ignore_req: blocklist support" - " not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -390,8 +383,7 @@ static int ki_blst_rpl_set_ignore(sip_msg_t* msg, int mask) msg->rpl_send_flags.blst_imask|=blst_imask; return 1; #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_ignore_req: blocklist support" - " not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -432,8 +424,7 @@ static int ki_blst_rpl_clear_ignore(sip_msg_t* msg, int mask) msg->rpl_send_flags.blst_imask&=~blst_imask; return 1; #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_ignore_req: blocklist support" - " not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; }