From 73972a702a63d7209d303dbe4b3530aa8f9ffda2 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Wed, 17 May 2023 16:36:55 +0200 Subject: [PATCH] log_systemd: clang-format for coherent indentation and coding style --- src/modules/log_systemd/journal_send.c | 64 ++++++++--------- src/modules/log_systemd/log_systemd_mod.c | 87 ++++++++++++----------- 2 files changed, 73 insertions(+), 78 deletions(-) diff --git a/src/modules/log_systemd/journal_send.c b/src/modules/log_systemd/journal_send.c index a90aae48d97..ae71edb4165 100644 --- a/src/modules/log_systemd/journal_send.c +++ b/src/modules/log_systemd/journal_send.c @@ -38,86 +38,78 @@ int k_sd_journal_send_xavp(str *rname) rxavp = xavp_get(rname, NULL); - if (!rxavp || rxavp->val.type != SR_XTYPE_XAVP) { + if(!rxavp || rxavp->val.type != SR_XTYPE_XAVP) { LM_ERR("not a valid xavp: %.*s?\n", rname->len, rname->s); return -1; } /* first, count xavp nodes */ - for (nxavp = rxavp->val.v.xavp, cnt = 0; - nxavp; - nxavp = nxavp->next, cnt++); + for(nxavp = rxavp->val.v.xavp, cnt = 0; nxavp; nxavp = nxavp->next, cnt++) + ; - if (cnt == 0) { + if(cnt == 0) { /* nothing to log? */ LM_NOTICE("empty xavp: %.*s?, no log event was sent to journald\n", - rname->len, - rname->s); + rname->len, rname->s); return 1; } - logv = pkg_malloc(cnt * sizeof (struct iovec)); + logv = pkg_malloc(cnt * sizeof(struct iovec)); - if (!logv) { + if(!logv) { LM_ERR("failed to allocate pkg memory\n"); return -1; } ret = -1; - for (nxavp = rxavp->val.v.xavp, cnt = 0; - nxavp; - nxavp = nxavp->next, cnt++) - { - if (nxavp->val.type == SR_XTYPE_LONG) { - buflen = snprintf(NULL, 0, - "%.*s=%ld", - nxavp->name.len, nxavp->name.s, - nxavp->val.v.l); - logv[cnt].iov_base = pkg_malloc(buflen + 1/*snprintf's trailing \0*/); - if (!logv[cnt].iov_base ) { + for(nxavp = rxavp->val.v.xavp, cnt = 0; nxavp; nxavp = nxavp->next, cnt++) { + if(nxavp->val.type == SR_XTYPE_LONG) { + buflen = snprintf(NULL, 0, "%.*s=%ld", nxavp->name.len, + nxavp->name.s, nxavp->val.v.l); + logv[cnt].iov_base = + pkg_malloc(buflen + 1 /*snprintf's trailing \0*/); + if(!logv[cnt].iov_base) { LM_ERR("failed to allocate pkg memory\n"); goto free; } logv[cnt].iov_len = buflen; - snprintf(logv[cnt].iov_base, buflen + 1, - "%.*s=%ld", - nxavp->name.len, nxavp->name.s, - nxavp->val.v.l); - } else if (nxavp->val.type == SR_XTYPE_STR) { + snprintf(logv[cnt].iov_base, buflen + 1, "%.*s=%ld", + nxavp->name.len, nxavp->name.s, nxavp->val.v.l); + } else if(nxavp->val.type == SR_XTYPE_STR) { buflen = nxavp->name.len + 1 + nxavp->val.v.s.len; logv[cnt].iov_base = pkg_malloc(buflen); - if (!logv[cnt].iov_base) { + if(!logv[cnt].iov_base) { LM_ERR("failed to allocate pkg memory\n"); goto free; } logv[cnt].iov_len = buflen; memcpy(logv[cnt].iov_base, nxavp->name.s, nxavp->name.len); - ((char*)logv[cnt].iov_base)[nxavp->name.len] = '='; - memcpy(((char*)(logv[cnt].iov_base)) + nxavp->name.len + 1, - nxavp->val.v.s.s, - nxavp->val.v.s.len); + ((char *)logv[cnt].iov_base)[nxavp->name.len] = '='; + memcpy(((char *)(logv[cnt].iov_base)) + nxavp->name.len + 1, + nxavp->val.v.s.s, nxavp->val.v.s.len); } else { LM_NOTICE("unsupported type %d for field %.*s, skipped...\n", - nxavp->val.type, - nxavp->name.len, nxavp->name.s); + nxavp->val.type, nxavp->name.len, nxavp->name.s); logv[cnt].iov_len = 0; logv[cnt].iov_base = NULL; } - LM_DBG("added io slice %d: %.*s\n", cnt, (int)logv[cnt].iov_len, (char*)logv[cnt].iov_base); + LM_DBG("added io slice %d: %.*s\n", cnt, (int)logv[cnt].iov_len, + (char *)logv[cnt].iov_base); } - if (sd_journal_sendv(logv, cnt) != 0) { + if(sd_journal_sendv(logv, cnt) != 0) { LM_ERR("sd_journal_sendv() failed\n"); } else { ret = 1; } free: - for (i = 0 ; i < cnt ; i++) { - if (logv[i].iov_base) pkg_free(logv[i].iov_base); + for(i = 0; i < cnt; i++) { + if(logv[i].iov_base) + pkg_free(logv[i].iov_base); } pkg_free(logv); return ret; diff --git a/src/modules/log_systemd/log_systemd_mod.c b/src/modules/log_systemd/log_systemd_mod.c index 76ac5458495..0f6d5f460a6 100644 --- a/src/modules/log_systemd/log_systemd_mod.c +++ b/src/modules/log_systemd/log_systemd_mod.c @@ -39,37 +39,34 @@ MODULE_VERSION static int _lc_log_systemd = 0; void _lc_core_log_systemd(int lpriority, const char *format, ...); -static int mod_init(void); -static int child_init(int); +static int mod_init(void); +static int child_init(int); static void mod_destroy(void); -static int w_sd_journal_print(struct sip_msg* msg, char* lev, char* txt); -static int w_sd_journal_send_xavp(struct sip_msg* msg, char* xname, char*); +static int w_sd_journal_print(struct sip_msg *msg, char *lev, char *txt); +static int w_sd_journal_send_xavp(struct sip_msg *msg, char *xname, char *); -static cmd_export_t cmds[]={ - {"sd_journal_print", (cmd_function)w_sd_journal_print, 2, fixup_spve_spve, - 0, ANY_ROUTE}, - {"sd_journal_send_xavp", (cmd_function)w_sd_journal_send_xavp, 1, fixup_spve_spve, - 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0} -}; +static cmd_export_t cmds[] = { + {"sd_journal_print", (cmd_function)w_sd_journal_print, 2, + fixup_spve_spve, 0, ANY_ROUTE}, + {"sd_journal_send_xavp", (cmd_function)w_sd_journal_send_xavp, 1, + fixup_spve_spve, 0, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0}}; -static param_export_t params[]={ - {0, 0, 0} -}; +static param_export_t params[] = {{0, 0, 0}}; struct module_exports exports = { - "log_systemd", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd (cfg function) exports */ - params, /* param exports */ - 0, /* RPC method exports */ - 0, /* pseudo-variables exports */ - 0, /* response handling function */ - mod_init, /* module init function */ - child_init, /* per-child init function */ - mod_destroy /* module destroy function */ + "log_systemd", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* cmd (cfg function) exports */ + params, /* param exports */ + 0, /* RPC method exports */ + 0, /* pseudo-variables exports */ + 0, /* response handling function */ + mod_init, /* module init function */ + child_init, /* per-child init function */ + mod_destroy /* module destroy function */ }; /** @@ -97,26 +94,32 @@ static void mod_destroy(void) /** * */ -static int ki_sd_journal_print(sip_msg_t* msg, str* slev, str* stxt) +static int ki_sd_journal_print(sip_msg_t *msg, str *slev, str *stxt) { int ilev; /* one of LOG_EMERG, LOG_ALERT, LOG_CRIT, LOG_ERR, LOG_WARNING, * LOG_NOTICE, LOG_INFO, LOG_DEBUG, as defined in syslog.h, see syslog(3) */ ilev = LOG_DEBUG; - if(slev->len==9 && strncasecmp(slev->s, "LOG_EMERG", slev->len)==0) { + if(slev->len == 9 && strncasecmp(slev->s, "LOG_EMERG", slev->len) == 0) { ilev = LOG_EMERG; - } else if(slev->len==9 && strncasecmp(slev->s, "LOG_ALERT", slev->len)==0) { + } else if(slev->len == 9 + && strncasecmp(slev->s, "LOG_ALERT", slev->len) == 0) { ilev = LOG_ALERT; - } else if(slev->len==8 && strncasecmp(slev->s, "LOG_CRIT", slev->len)==0) { + } else if(slev->len == 8 + && strncasecmp(slev->s, "LOG_CRIT", slev->len) == 0) { ilev = LOG_CRIT; - } else if(slev->len==7 && strncasecmp(slev->s, "LOG_ERR", slev->len)==0) { + } else if(slev->len == 7 + && strncasecmp(slev->s, "LOG_ERR", slev->len) == 0) { ilev = LOG_ERR; - } else if(slev->len==11 && strncasecmp(slev->s, "LOG_WARNING", slev->len)==0) { + } else if(slev->len == 11 + && strncasecmp(slev->s, "LOG_WARNING", slev->len) == 0) { ilev = LOG_WARNING; - } else if(slev->len==10 && strncasecmp(slev->s, "LOG_NOTICE", slev->len)==0) { + } else if(slev->len == 10 + && strncasecmp(slev->s, "LOG_NOTICE", slev->len) == 0) { ilev = LOG_NOTICE; - } else if(slev->len==8 && strncasecmp(slev->s, "LOG_INFO", slev->len)==0) { + } else if(slev->len == 8 + && strncasecmp(slev->s, "LOG_INFO", slev->len) == 0) { ilev = LOG_INFO; } @@ -125,17 +128,17 @@ static int ki_sd_journal_print(sip_msg_t* msg, str* slev, str* stxt) return 1; } -static int w_sd_journal_print(struct sip_msg* msg, char* lev, char* txt) +static int w_sd_journal_print(struct sip_msg *msg, char *lev, char *txt) { str slev; str stxt; - if(fixup_get_svalue(msg, (gparam_t*)lev, &slev)!=0) { + if(fixup_get_svalue(msg, (gparam_t *)lev, &slev) != 0) { LM_ERR("unable to get level parameter\n"); return -1; } - if(fixup_get_svalue(msg, (gparam_t*)txt, &stxt)!=0) { + if(fixup_get_svalue(msg, (gparam_t *)txt, &stxt) != 0) { LM_ERR("unable to get text parameter\n"); return -1; } @@ -143,7 +146,7 @@ static int w_sd_journal_print(struct sip_msg* msg, char* lev, char* txt) return ki_sd_journal_print(msg, &slev, &stxt); } -#define LC_LOG_MSG_MAX_SIZE 16384 +#define LC_LOG_MSG_MAX_SIZE 16384 void _lc_core_log_systemd(int lpriority, const char *format, ...) { va_list arglist; @@ -156,16 +159,16 @@ void _lc_core_log_systemd(int lpriority, const char *format, ...) va_start(arglist, format); n = 0; - n += vsnprintf(obuf+n, LC_LOG_MSG_MAX_SIZE - n, format, arglist); + n += vsnprintf(obuf + n, LC_LOG_MSG_MAX_SIZE - n, format, arglist); va_end(arglist); sd_journal_print(priority, "%.*s", n, obuf); } -static int w_sd_journal_send_xavp(struct sip_msg* msg, char* xname, char* foo) +static int w_sd_journal_send_xavp(struct sip_msg *msg, char *xname, char *foo) { str sxname; - if(fixup_get_svalue(msg, (gparam_t*)xname, &sxname)!=0) { + if(fixup_get_svalue(msg, (gparam_t *)xname, &sxname) != 0) { LM_ERR("unable to get xname parameter\n"); return -1; } @@ -173,7 +176,7 @@ static int w_sd_journal_send_xavp(struct sip_msg* msg, char* xname, char* foo) return k_sd_journal_send_xavp(&sxname); } -static int ki_sd_journal_send_xavp(sip_msg_t* msg, str* xname) +static int ki_sd_journal_send_xavp(sip_msg_t *msg, str *xname) { return k_sd_journal_send_xavp(xname); } @@ -200,10 +203,10 @@ static sr_kemi_t sr_kemi_log_systemd_exports[] = { int mod_register(char *path, int *dlflags, void *p1, void *p2) { - if(_km_log_engine_type==0) + if(_km_log_engine_type == 0) return 0; - if(strcasecmp(_km_log_engine_type, "systemd")!=0) + if(strcasecmp(_km_log_engine_type, "systemd") != 0) return 0; km_log_func_set(&_lc_core_log_systemd);