uncrustify FORMAT set various uncrustify options
PR #1228
diff --git a/src/xml.c b/src/xml.c
index 7061538..fbf83a4 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -104,12 +104,12 @@
/* check NameStartChar (minus colon) */
LY_CHECK_ERR_RET(ly_getutf8(&in, &c, &parsed),
- LOGVAL(xmlctx->ctx, LY_VLOG_LINE, &xmlctx->line, LY_VCODE_INCHAR, in[0]),
- LY_EVALID);
+ LOGVAL(xmlctx->ctx, LY_VLOG_LINE, &xmlctx->line, LY_VCODE_INCHAR, in[0]),
+ LY_EVALID);
LY_CHECK_ERR_RET(!is_xmlqnamestartchar(c),
- LOGVAL(xmlctx->ctx, LY_VLOG_LINE, &xmlctx->line, LYVE_SYNTAX,
- "Identifier \"%s\" starts with an invalid character.", in - parsed),
- LY_EVALID);
+ LOGVAL(xmlctx->ctx, LY_VLOG_LINE, &xmlctx->line, LYVE_SYNTAX,
+ "Identifier \"%s\" starts with an invalid character.", in - parsed),
+ LY_EVALID);
/* check rest of the identifier */
do {
@@ -243,7 +243,7 @@
return LY_SUCCESS;
} else if (xmlctx->in->current[0] != '<') {
LOGVAL(ctx, LY_VLOG_LINE, &xmlctx->line, LY_VCODE_INSTREXP, LY_VCODE_INSTREXP_len(xmlctx->in->current),
- xmlctx->in->current, "element tag start ('<')");
+ xmlctx->in->current, "element tag start ('<')");
return LY_EVALID;
}
move_input(xmlctx, 1);
@@ -269,7 +269,7 @@
return LY_EVALID;
} else {
LOGVAL(ctx, LY_VLOG_LINE, &xmlctx->line, LYVE_SYNTAX, "Unknown XML section \"%.20s\".",
- &xmlctx->in->current[-2]);
+ &xmlctx->in->current[-2]);
return LY_EVALID;
}
rc = ign_todelim(xmlctx->in->current, endtag, endtag_len, &newlines, &parsed);
@@ -407,7 +407,7 @@
in += 6; /* " */
} else {
LOGVAL(ctx, LY_VLOG_LINE, &xmlctx->line, LYVE_SYNTAX,
- "Entity reference \"%.*s\" not supported, only predefined references allowed.", 10, &in[offset - 1]);
+ "Entity reference \"%.*s\" not supported, only predefined references allowed.", 10, &in[offset - 1]);
goto error;
}
offset = 0;
@@ -419,7 +419,7 @@
for (n = 0; isdigit(in[offset]); offset++) {
n = (10 * n) + (in[offset] - '0');
}
- } else if (in[offset] == 'x' && isxdigit(in[offset + 1])) {
+ } else if ((in[offset] == 'x') && isxdigit(in[offset + 1])) {
for (n = 0, ++offset; isxdigit(in[offset]); offset++) {
if (isdigit(in[offset])) {
u = (in[offset] - '0');
@@ -437,14 +437,14 @@
}
LY_CHECK_ERR_GOTO(in[offset] != ';',
- LOGVAL(ctx, LY_VLOG_LINE, &xmlctx->line, LY_VCODE_INSTREXP,
- LY_VCODE_INSTREXP_len(&in[offset]), &in[offset], ";"),
- error);
+ LOGVAL(ctx, LY_VLOG_LINE, &xmlctx->line, LY_VCODE_INSTREXP,
+ LY_VCODE_INSTREXP_len(&in[offset]), &in[offset], ";"),
+ error);
++offset;
LY_CHECK_ERR_GOTO(ly_pututf8(&buf[len], n, &u),
- LOGVAL(ctx, LY_VLOG_LINE, &xmlctx->line, LYVE_SYNTAX,
- "Invalid character reference \"%.*s\" (0x%08x).", 12, p, n),
- error);
+ LOGVAL(ctx, LY_VLOG_LINE, &xmlctx->line, LYVE_SYNTAX,
+ "Invalid character reference \"%.*s\" (0x%08x).", 12, p, n),
+ error);
len += u;
in += offset;
offset = 0;
@@ -525,17 +525,17 @@
/* match opening and closing element tags */
if (!xmlctx->elements.count) {
LOGVAL(xmlctx->ctx, LY_VLOG_LINE, &xmlctx->line, LYVE_SYNTAX, "Stray closing element tag (\"%.*s\").",
- name_len, name);
+ name_len, name);
return LY_EVALID;
}
e = (struct lyxml_elem *)xmlctx->elements.objs[xmlctx->elements.count - 1];
- if ((e->prefix_len != prefix_len) || (e->name_len != name_len)
- || (prefix_len && strncmp(prefix, e->prefix, e->prefix_len)) || strncmp(name, e->name, e->name_len)) {
+ if ((e->prefix_len != prefix_len) || (e->name_len != name_len) ||
+ (prefix_len && strncmp(prefix, e->prefix, e->prefix_len)) || strncmp(name, e->name, e->name_len)) {
LOGVAL(xmlctx->ctx, LY_VLOG_LINE, &xmlctx->line, LYVE_SYNTAX,
- "Opening (\"%.*s%s%.*s\") and closing (\"%.*s%s%.*s\") elements tag mismatch.",
- e->prefix_len, e->prefix ? e->prefix : "", e->prefix ? ":" : "", e->name_len, e->name,
- prefix_len, prefix ? prefix : "", prefix ? ":" : "", name_len, name);
+ "Opening (\"%.*s%s%.*s\") and closing (\"%.*s%s%.*s\") elements tag mismatch.",
+ e->prefix_len, e->prefix ? e->prefix : "", e->prefix ? ":" : "", e->name_len, e->name,
+ prefix_len, prefix ? prefix : "", prefix ? ":" : "", name_len, name);
return LY_EVALID;
}
@@ -556,7 +556,7 @@
/* parse closing tag */
if (xmlctx->in->current[0] != '>') {
LOGVAL(xmlctx->ctx, LY_VLOG_LINE, &xmlctx->line, LY_VCODE_INSTREXP, LY_VCODE_INSTREXP_len(xmlctx->in->current),
- xmlctx->in->current, "element tag termination ('>')");
+ xmlctx->in->current, "element tag termination ('>')");
return LY_EVALID;
}
@@ -614,7 +614,7 @@
/* store every namespace */
if ((prefix && !ly_strncmp("xmlns", prefix, prefix_len)) || (!prefix && !ly_strncmp("xmlns", name, name_len))) {
LY_CHECK_GOTO(ret = lyxml_ns_add(xmlctx, prefix ? name : NULL, prefix ? name_len : 0,
- dynamic ? value : strndup(value, value_len)), cleanup);
+ dynamic ? value : strndup(value, value_len)), cleanup);
dynamic = 0;
} else {
/* not a namespace */
@@ -664,7 +664,7 @@
return LY_EVALID;
} else if (xmlctx->in->current[0] != '=') {
LOGVAL(xmlctx->ctx, LY_VLOG_LINE, &xmlctx->line, LY_VCODE_INSTREXP, LY_VCODE_INSTREXP_len(xmlctx->in->current),
- xmlctx->in->current, "'='");
+ xmlctx->in->current, "'='");
return LY_EVALID;
}
move_input(xmlctx, 1);
@@ -678,7 +678,7 @@
return LY_EVALID;
} else if ((xmlctx->in->current[0] != '\'') && (xmlctx->in->current[0] != '\"')) {
LOGVAL(xmlctx->ctx, LY_VLOG_LINE, &xmlctx->line, LY_VCODE_INSTREXP, LY_VCODE_INSTREXP_len(xmlctx->in->current),
- xmlctx->in->current, "either single or double quotation mark");
+ xmlctx->in->current, "either single or double quotation mark");
return LY_EVALID;
}
@@ -725,7 +725,7 @@
return LY_EVALID;
} else if ((ly_getutf8(&in, &c, &parsed) || !is_xmlqnamestartchar(c))) {
LOGVAL(xmlctx->ctx, LY_VLOG_LINE, &xmlctx->line, LY_VCODE_INSTREXP, LY_VCODE_INSTREXP_len(in - parsed), in - parsed,
- "element tag end ('>' or '/>') or an attribute");
+ "element tag end ('>' or '/>') or an attribute");
return LY_EVALID;
}
@@ -806,14 +806,14 @@
/* parse next element, if any */
LY_CHECK_GOTO(ret = lyxml_next_element(xmlctx, &xmlctx->prefix, &xmlctx->prefix_len, &xmlctx->name,
- &xmlctx->name_len, &closing), cleanup);
+ &xmlctx->name_len, &closing), cleanup);
if (xmlctx->in->current[0] == '\0') {
/* update status */
xmlctx->status = LYXML_END;
} else if (closing) {
LOGVAL(ctx, LY_VLOG_LINE, &xmlctx->line, LYVE_SYNTAX, "Stray closing element tag (\"%.*s\").",
- xmlctx->name_len, xmlctx->name);
+ xmlctx->name_len, xmlctx->name);
ret = LY_EVALID;
goto cleanup;
} else {
@@ -911,7 +911,7 @@
/* parse element content */
ret = lyxml_parse_value(xmlctx, '<', (char **)&xmlctx->value, &xmlctx->value_len, &xmlctx->ws_only,
- &xmlctx->dynamic);
+ &xmlctx->dynamic);
LY_CHECK_GOTO(ret, cleanup);
if (!xmlctx->value_len) {