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

making USE_XML_INSERT permanent

Browse source
This commit is contained in:
Olof hagsand 2019-06-15 11:48:20 +02:00
parent 3bad8bc874
commit e5a1c821e9
3 changed files with 0 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/clixon_custom.h
View file

@ -41,10 +41,6 @@
*/ */
#undef RPC_USERNAME_ASSERT #undef RPC_USERNAME_ASSERT
/* Use new xml_insert code on sorted xml lists
*/
#define USE_XML_INSERT
/* Make namespace check on RESTCONF PUT and POST -d data /* Make namespace check on RESTCONF PUT and POST -d data
*/ */
#define RESTCONF_NS_DATA_CHECK #define RESTCONF_NS_DATA_CHECK

22
lib/src/clixon_datastore_write.c
View file

@ -154,17 +154,10 @@ text_modify(clicon_handle h,
goto fail; goto fail;
permit = 1; permit = 1;
} }
// int iamkey=0;
#ifdef USE_XML_INSERT
/* Add new xml node but without parent - insert when node fully /* Add new xml node but without parent - insert when node fully
copied (see changed conditional below) */ copied (see changed conditional below) */
if ((x0 = xml_new(x1name, NULL, (yang_stmt*)y0)) == NULL) if ((x0 = xml_new(x1name, NULL, (yang_stmt*)y0)) == NULL)
goto done; goto done;
#else
if ((x0 = xml_new(x1name, x0p, (yang_stmt*)y0)) == NULL)
goto done;
#endif
changed++; changed++;
/* Copy xmlns attributes */ /* Copy xmlns attributes */
@ -210,12 +203,10 @@ text_modify(clicon_handle h,
} }
} }
} }
#ifdef USE_XML_INSERT
if (changed){ if (changed){
if (xml_insert(x0p, x0) < 0) if (xml_insert(x0p, x0) < 0)
goto done; goto done;
} }
#endif
break; break;
case OP_DELETE: case OP_DELETE:
if (x0==NULL){ if (x0==NULL){
@ -295,17 +286,12 @@ text_modify(clicon_handle h,
goto fail; goto fail;
permit = 1; permit = 1;
} }
#ifdef USE_XML_INSERT
/* Add new xml node but without parent - insert when node fully /* Add new xml node but without parent - insert when node fully
* copied (see changed conditional below) * copied (see changed conditional below)
* Note x0 may dangle cases if exit before changed conditional * Note x0 may dangle cases if exit before changed conditional
*/ */
if ((x0 = xml_new(x1name, NULL, (yang_stmt*)y0)) == NULL) if ((x0 = xml_new(x1name, NULL, (yang_stmt*)y0)) == NULL)
goto done; goto done;
#else
if ((x0 = xml_new(x1name, x0p, (yang_stmt*)y0)) == NULL)
goto done;
#endif
changed++; changed++;
/* Copy xmlns attributes */ /* Copy xmlns attributes */
x1a = NULL; x1a = NULL;
@ -367,12 +353,10 @@ text_modify(clicon_handle h,
if (ret == 0) if (ret == 0)
goto fail; goto fail;
} }
#ifdef USE_XML_INSERT
if (changed){ if (changed){
if (xml_insert(x0p, x0) < 0) if (xml_insert(x0p, x0) < 0)
goto done; goto done;
} }
#endif
break; break;
case OP_DELETE: case OP_DELETE:
if (x0==NULL){ if (x0==NULL){
@ -396,17 +380,11 @@ text_modify(clicon_handle h,
break; break;
} /* CONTAINER switch op */ } /* CONTAINER switch op */
} /* else Y_CONTAINER */ } /* else Y_CONTAINER */
#ifndef USE_XML_INSERT
if (changed)
xml_sort(x0p, h);
#endif
retval = 1; retval = 1;
done: done:
#ifdef USE_XML_INSERT
/* Remove dangling added objects */ /* Remove dangling added objects */
if (changed && x0 && xml_parent(x0)==NULL) if (changed && x0 && xml_parent(x0)==NULL)
xml_purge(x0); xml_purge(x0);
#endif
if (x0vec) if (x0vec)
free(x0vec); free(x0vec);
return retval; return retval;

11
lib/src/clixon_xml_map.c
View file

@ -2085,13 +2085,8 @@ xml_default(cxobj *xt,
if (!cv_flag(y->ys_cv, V_UNSET)){ /* Default value exists */ if (!cv_flag(y->ys_cv, V_UNSET)){ /* Default value exists */
if (!xml_find(xt, y->ys_argument)){ if (!xml_find(xt, y->ys_argument)){
#ifdef USE_XML_INSERT
if ((xc = xml_new(y->ys_argument, NULL, y)) == NULL) if ((xc = xml_new(y->ys_argument, NULL, y)) == NULL)
goto done; goto done;
#else
if ((xc = xml_new(y->ys_argument, xt, y)) == NULL)
goto done;
#endif
xml_flag_set(xc, XML_FLAG_DEFAULT); xml_flag_set(xc, XML_FLAG_DEFAULT);
if ((xb = xml_new("body", xc, NULL)) == NULL) if ((xb = xml_new("body", xc, NULL)) == NULL)
goto done; goto done;
@ -2104,18 +2099,12 @@ xml_default(cxobj *xt,
goto done; goto done;
free(str); free(str);
added++; added++;
#ifdef USE_XML_INSERT
if (xml_insert(xt, xc) < 0) if (xml_insert(xt, xc) < 0)
goto done; goto done;
#endif
} }
} }
} }
} }
#ifndef USE_XML_INSERT
if (added)
xml_sort(xt, NULL);
#endif
retval = 0; retval = 0;
done: done:
return retval; return retval;