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

Refactor enum2int API

Browse source
This commit is contained in:
Olof hagsand 2024-01-29 10:59:04 +01:00
parent 99e9b89056
commit 9ecc7e0791
4 changed files with 44 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

19
apps/snmp/snmp_handler.c
View file

@ -658,10 +658,7 @@ snmp_table_rowstatus_get(clixon_handle h,
cxobj *xt = NULL;
char *xpath = NULL;
cxobj *xr;
int ret;
char *body;
char *intstr;
char *reason = NULL;
clixon_debug(CLIXON_DBG_CLIENT, "");
/* Prepare backend call by constructing namespace context */
@ -673,20 +670,8 @@ snmp_table_rowstatus_get(clixon_handle h,
clicon_ptr_get(h, "snmp-rowstatus-tree", (void**)&xt);
if (xt && (xr = xpath_first(xt, nsc, "%s", xpath)) != NULL &&
(body = xml_body(xr)) != NULL) {
if ((ret = yang_enum2valstr(yrestype, body, &intstr)) < 0)
if (yang_enum2int(yrestype, body, rowstatus) < 0)
goto done;
if (ret == 0){
clixon_debug(CLIXON_DBG_CLIENT, "%s invalid or not found", body);
*rowstatus = 0;
}
else {
if ((ret = parse_int32(intstr, rowstatus, &reason)) < 0)
goto done;
if (ret == 0){
clixon_debug(CLIXON_DBG_CLIENT, "parse_int32: %s", reason);
*rowstatus = 0;
}
}
}
else
*rowstatus = 0;
@ -696,8 +681,6 @@ snmp_table_rowstatus_get(clixon_handle h,
free(xpath);
if (nsc)
xml_nsctx_free(nsc);
if (reason)
free(reason);
return retval;
}

4
apps/snmp/snmp_lib.c
View file

@ -778,7 +778,7 @@ type_xml2snmp_pre(char *xmlstr0,
{
int retval = -1;
yang_stmt *yrestype; /* resolved type */
char *restype = NULL; /* resolved type */
char *restype = NULL; /* resolved type */
char *str = NULL;
int ret;
cbuf *cb = NULL;
@ -809,7 +809,7 @@ type_xml2snmp_pre(char *xmlstr0,
else
str = "1";
}
else if( strcmp(restype, "decimal64") == 0 ) {
else if (strcmp(restype, "decimal64") == 0 ) {
cg_var* cv = yang_cv_get(ys);
int64_t num;