-
Notifications
You must be signed in to change notification settings - Fork 3
/
Copy pathkore_mustach-4.0.0.patch
71 lines (60 loc) · 2.06 KB
/
kore_mustach-4.0.0.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
--- /proc/self/fd/11 2022-04-03 16:07:05.312251066 +0000
+++ kore_mustach.c 2022-04-03 16:06:48.148916783 +0000
@@ -335,15 +335,12 @@
if (o == NULL)
return (NULL);
- while (type <= KORE_JSON_TYPE_INTEGER_U64) {
+ while (type <= KORE_JSON_TYPE_LITERAL) {
if ((item = kore_json_find(o, name, type)) != NULL)
return (item);
- if (kore_json_errno() != KORE_JSON_ERR_TYPE_MISMATCH)
- return (NULL);
-
- type = type << 1;
+ type++;
}
return (NULL);
@@ -467,8 +464,6 @@
compare(struct kore_json_item *o, const char *value)
{
double d;
- int64_t i;
- uint64_t u;
int err;
switch (o->type) {
@@ -476,14 +471,6 @@
d = kore_strtodouble(value, DBL_MIN, DBL_MAX, &err);
return (!err) ? 0 : (o->data.number > d) - (o->data.number < d);
- case KORE_JSON_TYPE_INTEGER:
- i = kore_strtonum64(value, 1, &err);
- return (!err) ? 0 : (o->data.integer > i) - (o->data.integer < i);
-
- case KORE_JSON_TYPE_INTEGER_U64:
- u = kore_strtonum64(value, 0, &err);
- return (!err) ? 0 : (o->data.u64 > u) - (o->data.u64 < u);
-
case KORE_JSON_TYPE_STRING:
return (strcmp(o->data.string, value));
@@ -579,9 +566,6 @@
{
size_t err = mustach_errno * -1;
- if (mustach_errno == kore_json_errno())
- return (kore_json_strerror());
-
if (err < sizeof(mustach_errtab) / sizeof(mustach_errtab[0]))
return (mustach_errtab[err]);
@@ -607,7 +591,6 @@
mustach_errno = mustach_file(template, 0, &itf, &cl, flags, 0);
if (mustach_errno >= 0) {
- mustach_errno = kore_json_errno();
*result = cl.result;
} else {
kore_buf_free(cl.result);
@@ -626,7 +609,7 @@
mustach_errno = 0;
if (data != NULL) {
- kore_json_init(&json, data, strlen(data));
+ kore_json_init(&json, (const uint8_t *)data, strlen(data));
if (!kore_json_parse(&json))
mustach_errno = MUSTACH_ERROR_INVALID_ITF;
}