Don't use XWARN and fix copypasta.

This commit is contained in:
kristapsdz committed 2020-07-17 10:09:39 +00:00
1 parent 4d7a2e049f
commit 3da1abdf53
3 files changed
+16 -8

No files matched your search

+4 -2
View File
@@ -550,7 +550,8 @@ khtml_attrx(struct khtmlreq *req, enum kelem elem, ...)
if (tags[elem].flags != TAG_VOID &&
tags[elem].flags != TAG_INSTRUCTION &&
req->elemsz >= KHTML_STACK_MAX) {
XWARNX("maximum html stack size exceeded");
kutil_warnx(NULL, NULL,
"maximum html stack size exceeded");
return KCGI_ENOMEM;
}
@@ -617,7 +618,8 @@ khtml_attr(struct khtmlreq *req, enum kelem elem, ...)
if (tags[elem].flags != TAG_VOID &&
tags[elem].flags != TAG_INSTRUCTION &&
req->elemsz >= KHTML_STACK_MAX) {
XWARNX("maximum html stack size exceeded");
kutil_warnx(NULL, NULL,
"maximum html stack size exceeded");
return KCGI_ENOMEM;
}
+6 -3
View File
@@ -321,7 +321,8 @@ kjson_arrayp_open(struct kjsonreq *r, const char *key)
enum kcgi_err er;
if (r->stackpos >= KJSON_STACK_MAX - 1) {
XWARNX("maximum json stack size exceeded");
kutil_warnx(NULL, NULL,
"maximum json stack size exceeded");
return KCGI_ENOMEM;
}
@@ -408,7 +409,8 @@ kjson_stringp_open(struct kjsonreq *r, const char *key)
enum kcgi_err er;
if (r->stackpos >= KJSON_STACK_MAX - 1) {
XWARNX("maximum json stack size exceeded");
kutil_warnx(NULL, NULL,
"maximum json stack size exceeded");
return KCGI_ENOMEM;
}
@@ -449,7 +451,8 @@ kjson_objp_open(struct kjsonreq *r, const char *key)
enum kcgi_err er;
if (r->stackpos >= KJSON_STACK_MAX - 1) {
XWARNX("maximum json stack size exceeded");
kutil_warnx(NULL, NULL,
"maximum json stack size exceeded");
return KCGI_ENOMEM;
}
+6 -3
View File
@@ -67,7 +67,8 @@ kxml_push(struct kxmlreq *r, size_t elem)
enum kcgi_err er;
if (r->stackpos >= KXML_STACK_MAX) {
XWARNX("maximum json stack size exceeded");
kutil_warnx(NULL, NULL,
"maximum xml stack size exceeded");
return KCGI_ENOMEM;
} else if (elem >= r->elemsz)
return KCGI_WRITER;
@@ -89,7 +90,8 @@ kxml_pushnull(struct kxmlreq *r, size_t elem)
enum kcgi_err er;
if (r->stackpos >= KXML_STACK_MAX) {
XWARNX("maximum json stack size exceeded");
kutil_warnx(NULL, NULL,
"maximum xml stack size exceeded");
return KCGI_ENOMEM;
} else if (elem >= r->elemsz)
return KCGI_WRITER;
@@ -162,7 +164,8 @@ kxml_pushattrs(struct kxmlreq *r, size_t elem, ...)
enum kcgi_err er = KCGI_OK;
if (r->stackpos >= KXML_STACK_MAX) {
XWARNX("maximum json stack size exceeded");
kutil_warnx(NULL, NULL,
"maximum xml stack size exceeded");
return KCGI_ENOMEM;
} else if (elem >= r->elemsz)
return KCGI_WRITER;