experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop __FUNCTION__ from clixon_debug() calls

Browse source
This commit is contained in:
Philip Prindeville 2024-01-10 21:49:59 -07:00 • committed by Olof Hagsand
parent d5a8d6b6e1
commit cf2e27b43d
74 changed files with 619 additions and 578 deletions
Download patch file Download diff file Expand all files Collapse all files

12
example/main/example_backend.c
View file

@ -752,7 +752,7 @@ example_lockdb(clixon_handle h,
{
int retval = -1;
clixon_debug(CLIXON_DBG_DEFAULT, "%s Lock callback: db%s: locked:%d", __FUNCTION__, db, lock);
clixon_debug(CLIXON_DBG_DEFAULT, "Lock callback: db%s: locked:%d", db, lock);
/* Part of cached pagination example
*/
if (strcmp(db, "running") == 0 && lock == 0 &&
@ -793,7 +793,7 @@ example_extension(clixon_handle h,
extname = yang_argument_get(yext);
if (strcmp(modname, "example") != 0 || strcmp(extname, "e4") != 0)
goto ok;
clixon_debug(CLIXON_DBG_DEFAULT, "%s Enabled extension:%s:%s", __FUNCTION__, modname, extname);
clixon_debug(CLIXON_DBG_DEFAULT, "Enabled extension:%s:%s", modname, extname);
if ((yc = yang_find(ys, 0, NULL)) == NULL)
goto ok;
if ((yn = ys_dup(yc)) == NULL)
@ -1020,7 +1020,7 @@ upgrade_2014_to_2016(clixon_handle h,
int i;
char *name;
clixon_debug(CLIXON_DBG_DEFAULT, "%s from:%d to:%d", __FUNCTION__, from, to);
clixon_debug(CLIXON_DBG_DEFAULT, "from:%d to:%d", from, to);
if (op != XML_FLAG_CHANGE) /* Only treat fully present modules */
goto ok;
/* Get Yang module for this namespace. Note it may not exist (if obsolete) */
@ -1123,14 +1123,14 @@ upgrade_2016_to_2018(clixon_handle h,
size_t vlen;
int i;
clixon_debug(CLIXON_DBG_DEFAULT, "%s from:%d to:%d", __FUNCTION__, from, to);
clixon_debug(CLIXON_DBG_DEFAULT, "from:%d to:%d", from, to);
if (op != XML_FLAG_CHANGE) /* Only treat fully present modules */
goto ok;
/* Get Yang module for this namespace. Note it may not exist (if obsolete) */
yspec = clicon_dbspec_yang(h);
if ((ym = yang_find_module_by_namespace(yspec, ns)) == NULL)
goto ok; /* shouldnt happen */
clixon_debug(CLIXON_DBG_DEFAULT, "%s module %s", __FUNCTION__, ym?yang_argument_get(ym):"none");
clixon_debug(CLIXON_DBG_DEFAULT, "module %s", ym?yang_argument_get(ym):"none");
/* Get all XML nodes with that namespace */
if (xml_namespace_vec(h, xt, ns, &vec, &vlen) < 0)
goto done;
@ -1432,7 +1432,7 @@ clixon_plugin_init(clixon_handle h)
char **argv;
int c;
clixon_debug(CLIXON_DBG_DEFAULT, "%s backend", __FUNCTION__);
clixon_debug(CLIXON_DBG_DEFAULT, "backend");
/* Get user command-line options (after --) */
if (clicon_argv_get(h, &argc, &argv) < 0)

2
example/main/example_backend_nacm.c
View file

@ -241,7 +241,7 @@ clixon_plugin_init(clixon_handle h)
char **argv;
int c;
clixon_debug(CLIXON_DBG_DEFAULT, "%s backend nacm", __FUNCTION__);
clixon_debug(CLIXON_DBG_DEFAULT, "backend nacm");
/* Get user command-line options (after --) */
if (clicon_argv_get(h, &argc, &argv) < 0)
goto done;

2
example/main/example_netconf.c
View file

@ -121,7 +121,7 @@ static struct clixon_plugin_api api = {
clixon_plugin_api *
clixon_plugin_init(clixon_handle h)
{
clixon_debug(CLIXON_DBG_DEFAULT, "%s restconf", __FUNCTION__);
clixon_debug(CLIXON_DBG_DEFAULT, "restconf");
/* Register local netconf rpc client (note not backend rpc client) */
if (rpc_callback_register(h, netconf_client_rpc, NULL,
"urn:example:clixon", "client-rpc") < 0)

14
example/main/example_restconf.c
View file

@ -220,7 +220,7 @@ example_basic_auth(clixon_handle h,
size_t authlen;
int ret;
clixon_debug(CLIXON_DBG_DEFAULT, "%s", __FUNCTION__);
clixon_debug(CLIXON_DBG_DEFAULT, "");
if (authp == NULL){
clixon_err(OE_PLUGIN, EINVAL, "Authp output parameter is NULL");
goto done;
@ -246,7 +246,7 @@ example_basic_auth(clixon_handle h,
goto fail;
*passwd = '\0';
passwd++;
clixon_debug(CLIXON_DBG_DEFAULT, "%s http user:%s passwd:%s", __FUNCTION__, user, passwd);
clixon_debug(CLIXON_DBG_DEFAULT, "http user:%s passwd:%s", user, passwd);
/* Here get auth sub-tree where all the users are */
if ((cb = cbuf_new()) == NULL)
goto done;
@ -261,7 +261,7 @@ example_basic_auth(clixon_handle h,
user=NULL; /* to avoid free below */
retval = 1;
done: /* error */
clixon_debug(CLIXON_DBG_DEFAULT, "%s retval:%d authp:%s", __FUNCTION__, retval, authp?"":*authp);
clixon_debug(CLIXON_DBG_DEFAULT, "retval:%d authp:%s", retval, authp?"":*authp);
if (user)
free(user);
if (cb)
@ -296,7 +296,7 @@ example_restconf_credentials(clixon_handle h,
{
int retval = -1;
clixon_debug(CLIXON_DBG_DEFAULT, "%s auth:%s", __FUNCTION__, clixon_auth_type_int2str(auth_type));
clixon_debug(CLIXON_DBG_DEFAULT, "auth:%s", clixon_auth_type_int2str(auth_type));
switch (auth_type){
case CLIXON_AUTH_NONE: /* FEATURE clixon-restconf:allow-auth-none must be enabled */
retval = 0;
@ -310,7 +310,7 @@ example_restconf_credentials(clixon_handle h,
break;
}
done:
clixon_debug(CLIXON_DBG_DEFAULT, "%s retval:%d authp:%s", __FUNCTION__, retval, *authp);
clixon_debug(CLIXON_DBG_DEFAULT, "retval:%d authp:%s", retval, *authp);
return retval;
}
@ -354,7 +354,7 @@ restconf_client_rpc(clixon_handle h,
int
example_restconf_start(clixon_handle h)
{
clixon_debug(CLIXON_DBG_DEFAULT, "%s", __FUNCTION__);
clixon_debug(CLIXON_DBG_DEFAULT, "");
return 0;
}
@ -439,7 +439,7 @@ clixon_plugin_init(clixon_handle h)
char **argv = NULL;
int c;
clixon_debug(CLIXON_DBG_DEFAULT, "%s restconf", __FUNCTION__);
clixon_debug(CLIXON_DBG_DEFAULT, "restconf");
/* Get user command-line options (after --) */
if (clicon_argv_get(h, &argc, &argv) < 0)
return NULL;