fixup! parser & printer CHANGE xpath1.0 type correct handling

michalvasko · michalvasko · commit e5cafbf9007c · 2017-12-05T13:21:00.000+01:00
diff --git a/src/parser.c b/src/parser.c
@@ -1901,7 +1901,7 @@ lyp_parse_value(struct lys_type *type, const char **value_, struct lyxml_elem *x
 
         /* special handling of ietf-yang-types xpath1.0 */
         for (tpdf = type->der;
-             tpdf->module && strcmp(tpdf->name, "xpath1.0") && strcmp(tpdf->module->name, "ietf-yang-types");
+             tpdf->module && (strcmp(tpdf->name, "xpath1.0") || strcmp(tpdf->module->name, "ietf-yang-types"));
              tpdf = tpdf->type.der);
         if (tpdf->module && xml) {
             /* convert value into the json format */
diff --git a/src/printer_xml.c b/src/printer_xml.c
@@ -296,7 +296,7 @@ xml_print_leaf(struct lyout *out, int level, const struct lyd_node *node, int to
             return EXIT_FAILURE;
         }
         for (tpdf = type->der;
-             tpdf->module && strcmp(tpdf->name, "xpath1.0") && strcmp(tpdf->module->name, "ietf-yang-types");
+             tpdf->module && (strcmp(tpdf->name, "xpath1.0") || strcmp(tpdf->module->name, "ietf-yang-types"));
              tpdf = tpdf->type.der);
         /* special handling of ietf-yang-types xpath1.0 */
         if (tpdf->module) {

Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,7 @@ xml_print_leaf(struct lyout out, int level, const struct lyd_node node, int to`
`296`	`296`	`return EXIT_FAILURE;`
`297`	`297`	`}`
`298`	`298`	`for (tpdf = type->der;`
`299`		`- tpdf->module && strcmp(tpdf->name, "xpath1.0") && strcmp(tpdf->module->name, "ietf-yang-types");`
	`299`	`+ tpdf->module && (strcmp(tpdf->name, "xpath1.0") \|\| strcmp(tpdf->module->name, "ietf-yang-types"));`
`300`	`300`	`tpdf = tpdf->type.der);`
`301`	`301`	`/* special handling of ietf-yang-types xpath1.0 */`
`302`	`302`	`if (tpdf->module) {`