Commit ca82f1ca1f2c9c4f3954d4e1a388a73b7715440f
2024-08-14T13:40:51
fix json_from_str
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 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344
diff --git a/Makefile b/Makefile
index 2156772..b2e4a1c 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ all:
${MAKE} -C kc3s all
${MAKE} -C ekc3 all
${MAKE} -C event all
- -${MAKE} -C json all
+ ${MAKE} -C json all
${MAKE} -C socket all
${MAKE} -C http all
${MAKE} -C httpd all
@@ -34,7 +34,7 @@ asan:
${MAKE} -C kc3s asan
${MAKE} -C ekc3 asan
${MAKE} -C event asan
- -${MAKE} -C json asan
+ ${MAKE} -C json asan
${MAKE} -C socket asan
${MAKE} -C http asan
${MAKE} -C httpd asan
@@ -50,7 +50,7 @@ build:
${MAKE} -C kc3s build
${MAKE} -C ekc3 build
${MAKE} -C event build
- -${MAKE} -C json build
+ ${MAKE} -C json build
${MAKE} -C socket build
${MAKE} -C http build
${MAKE} -C httpd build
@@ -65,7 +65,7 @@ clean:
${MAKE} -C kc3s clean
${MAKE} -C ekc3 clean
${MAKE} -C event clean
- -${MAKE} -C json clean
+ ${MAKE} -C json clean
${MAKE} -C socket clean
${MAKE} -C http clean
${MAKE} -C httpd clean
@@ -79,7 +79,7 @@ clean_cov:
${MAKE} -C kc3s clean_cov
${MAKE} -C ekc3 clean_cov
${MAKE} -C event clean_cov
- -${MAKE} -C json clean_cov
+ ${MAKE} -C json clean_cov
${MAKE} -C socket clean_cov
${MAKE} -C http clean_cov
${MAKE} -C httpd clean_cov
@@ -94,7 +94,7 @@ cov:
${MAKE} -C kc3s cov
${MAKE} -C ekc3 cov
${MAKE} -C event cov
- -${MAKE} -C json cov
+ ${MAKE} -C json cov
${MAKE} -C socket cov
${MAKE} -C http cov
${MAKE} -C httpd cov
@@ -109,7 +109,7 @@ debug:
${MAKE} -C kc3s debug
${MAKE} -C ekc3 debug
${MAKE} -C event debug
- -${MAKE} -C json debug
+ ${MAKE} -C json debug
${MAKE} -C socket debug
${MAKE} -C http debug
${MAKE} -C httpd debug
@@ -150,7 +150,7 @@ distclean:
${MAKE} -C kc3s distclean
${MAKE} -C ekc3 distclean
${MAKE} -C event distclean
- -${MAKE} -C json distclean
+ ${MAKE} -C json distclean
${MAKE} -C socket distclean
${MAKE} -C http distclean
${MAKE} -C httpd distclean
@@ -227,7 +227,7 @@ gcovr:
${MAKE} -C kc3s gcovr
${MAKE} -C ekc3 gcovr
${MAKE} -C event gcovr
- -${MAKE} -C json gcovr
+ ${MAKE} -C json gcovr
${MAKE} -C socket gcovr
${MAKE} -C http gcovr
${MAKE} -C httpd gcovr
@@ -269,7 +269,7 @@ gdb_test_http:
${MAKE} -C libkc3 debug
${MAKE} -C ikc3 debug
${MAKE} -C kc3s debug
- -${MAKE} -C json debug
+ ${MAKE} -C json debug
${MAKE} -C socket debug
${MAKE} -C http debug
${MAKE} -C test gdb_test_http
@@ -280,7 +280,7 @@ gdb_test_http_asan:
${MAKE} -C libkc3 asan
${MAKE} -C ikc3 asan
${MAKE} -C kc3s asan
- -${MAKE} -C json asan
+ ${MAKE} -C json asan
${MAKE} -C socket asan
${MAKE} -C http asan
${MAKE} -C test gdb_test_http_asan
@@ -291,7 +291,7 @@ gdb_test_httpd:
${MAKE} -C libkc3 debug
${MAKE} -C ikc3 debug
${MAKE} -C kc3s debug
- -${MAKE} -C json debug
+ ${MAKE} -C json debug
${MAKE} -C socket debug
${MAKE} -C http debug
${MAKE} -C httpd debug
@@ -303,7 +303,7 @@ gdb_test_httpd_asan:
${MAKE} -C libkc3 asan
${MAKE} -C ikc3 asan
${MAKE} -C kc3s asan
- -${MAKE} -C json asan
+ ${MAKE} -C json asan
${MAKE} -C socket asan
${MAKE} -C http asan
${MAKE} -C httpd asan
@@ -334,7 +334,7 @@ http:
${MAKE} -C kc3s build
${MAKE} -C ekc3 build
${MAKE} -C event build
- -${MAKE} -C json build
+ ${MAKE} -C json build
${MAKE} -C socket build
${MAKE} -C http build
@@ -346,7 +346,7 @@ httpd:
${MAKE} -C kc3s build
${MAKE} -C ekc3 build
${MAKE} -C event build
- -${MAKE} -C json build
+ ${MAKE} -C json build
${MAKE} -C socket build
${MAKE} -C http build
${MAKE} -C httpd build
@@ -389,28 +389,28 @@ json:
${MAKE} -C ucd2c
${MAKE} -C libkc3 build
${MAKE} -C ikc3 build
- -${MAKE} -C json build
+ ${MAKE} -C json build
json_asan:
${MAKE} -C libtommath asan
${MAKE} -C ucd2c
${MAKE} -C libkc3 asan
${MAKE} -C ikc3 asan
- -${MAKE} -C json asan
+ ${MAKE} -C json asan
json_cov:
${MAKE} -C libtommath cov
${MAKE} -C ucd2c
${MAKE} -C libkc3 cov
${MAKE} -C ikc3 cov
- -${MAKE} -C json cov
+ ${MAKE} -C json cov
json_debug:
${MAKE} -C libtommath debug
${MAKE} -C ucd2c
${MAKE} -C libkc3 debug
${MAKE} -C ikc3 debug
- -${MAKE} -C json debug
+ ${MAKE} -C json debug
install:
${MAKE} -C libkc3 install
@@ -418,11 +418,11 @@ install:
${MAKE} -C kc3s install
${MAKE} -C ekc3 install
${MAKE} -C event install
- -${MAKE} -C json install
+ ${MAKE} -C json install
${MAKE} -C socket install
${MAKE} -C http install
${MAKE} -C httpd install
- -${MAKE} -C json install
+ ${MAKE} -C json install
${MAKE} -C window install
kc3-${KC3_VERSION}.tar.gz: kc3.index
@@ -529,7 +529,7 @@ test:
${MAKE} -C kc3s build
${MAKE} -C ekc3 build
${MAKE} -C event build
- -${MAKE} -C json build
+ ${MAKE} -C json build
${MAKE} -C socket build
${MAKE} -C http build
${MAKE} -C httpd build
@@ -544,7 +544,7 @@ test_asan:
${MAKE} -C kc3s asan
${MAKE} -C ekc3 asan
${MAKE} -C event asan
- -${MAKE} -C json asan
+ ${MAKE} -C json asan
${MAKE} -C socket asan
${MAKE} -C http asan
${MAKE} -C httpd asan
@@ -558,7 +558,7 @@ test_cov:
${MAKE} -C kc3s cov clean_cov
${MAKE} -C ekc3 cov clean_cov
${MAKE} -C event cov clean_cov
- -${MAKE} -C json cov clean_cov
+ ${MAKE} -C json cov clean_cov
${MAKE} -C socket cov clean_cov
${MAKE} -C http cov clean_cov
${MAKE} -C httpd cov clean_cov
@@ -572,7 +572,7 @@ test_debug:
${MAKE} -C kc3s debug
${MAKE} -C ekc3 debug
${MAKE} -C event debug
- -${MAKE} -C json debug
+ ${MAKE} -C json debug
${MAKE} -C socket debug
${MAKE} -C http debug
${MAKE} -C httpd debug
@@ -627,7 +627,7 @@ test_http:
${MAKE} -C libkc3 build
${MAKE} -C ikc3 build
${MAKE} -C kc3s build
- -${MAKE} -C json build
+ ${MAKE} -C json build
${MAKE} -C socket build
${MAKE} -C http build
${MAKE} -C test test_http
@@ -638,7 +638,7 @@ test_http_asan:
${MAKE} -C libkc3 asan
${MAKE} -C ikc3 asan
${MAKE} -C kc3s asan
- -${MAKE} -C json asan
+ ${MAKE} -C json asan
${MAKE} -C socket asan
${MAKE} -C http asan
${MAKE} -C test test_http_asan
@@ -649,7 +649,7 @@ test_http_cov:
${MAKE} -C libkc3 cov
${MAKE} -C ikc3 cov
${MAKE} -C kc3s cov
- -${MAKE} -C json cov
+ ${MAKE} -C json cov
${MAKE} -C socket cov
${MAKE} -C http cov
${MAKE} -C test test_http_cov
@@ -660,7 +660,7 @@ test_http_debug:
${MAKE} -C libkc3 debug
${MAKE} -C ikc3 debug
${MAKE} -C kc3s debug
- -${MAKE} -C json debug
+ ${MAKE} -C json debug
${MAKE} -C socket debug
${MAKE} -C http debug
${MAKE} -C test test_http_debug
@@ -671,7 +671,7 @@ test_httpd:
${MAKE} -C libkc3 build
${MAKE} -C ikc3 build
${MAKE} -C kc3s build
- -${MAKE} -C json build
+ ${MAKE} -C json build
${MAKE} -C socket build
${MAKE} -C http build
${MAKE} -C httpd build
@@ -683,7 +683,7 @@ test_httpd_asan:
${MAKE} -C libkc3 asan
${MAKE} -C ikc3 asan
${MAKE} -C kc3s asan
- -${MAKE} -C json asan
+ ${MAKE} -C json asan
${MAKE} -C socket asan
${MAKE} -C http asan
${MAKE} -C httpd asan
@@ -695,7 +695,7 @@ test_httpd_cov:
${MAKE} -C libkc3 cov
${MAKE} -C ikc3 cov
${MAKE} -C kc3s cov
- -${MAKE} -C json cov
+ ${MAKE} -C json cov
${MAKE} -C socket cov
${MAKE} -C http cov
${MAKE} -C httpd cov
@@ -707,7 +707,7 @@ test_httpd_debug:
${MAKE} -C libkc3 debug
${MAKE} -C ikc3 debug
${MAKE} -C kc3s debug
- -${MAKE} -C json debug
+ ${MAKE} -C json debug
${MAKE} -C socket debug
${MAKE} -C http debug
${MAKE} -C httpd debug
@@ -746,7 +746,7 @@ test_json:
${MAKE} -C ucd2c
${MAKE} -C libkc3 build
${MAKE} -C ikc3 build
- -${MAKE} -C json build
+ ${MAKE} -C json build
${MAKE} -C test test_json
test_json_asan:
@@ -754,7 +754,7 @@ test_json_asan:
${MAKE} -C ucd2c
${MAKE} -C libkc3 asan
${MAKE} -C ikc3 asan
- -${MAKE} -C json asan
+ ${MAKE} -C json asan
${MAKE} -C test test_json_asan
test_json_cov:
@@ -762,7 +762,7 @@ test_json_cov:
${MAKE} -C ucd2c
${MAKE} -C libkc3 cov
${MAKE} -C ikc3 cov
- -${MAKE} -C json cov
+ ${MAKE} -C json cov
${MAKE} -C test test_json_cov
test_json_debug:
@@ -770,7 +770,7 @@ test_json_debug:
${MAKE} -C ucd2c
${MAKE} -C libkc3 debug
${MAKE} -C ikc3 debug
- -${MAKE} -C json debug
+ ${MAKE} -C json debug
${MAKE} -C test test_json_debug
test_libkc3:
diff --git a/json/json.c b/json/json.c
index 1cbdf3e..2c07d04 100644
--- a/json/json.c
+++ b/json/json.c
@@ -89,8 +89,7 @@ s_tag * json_buf_parse (s_buf *buf, s_tag *dest)
s_tag * json_from_str (const s_str *src, s_tag *dest)
{
- s_tag *r;
s_buf buf;
- buf_init_str(&buf, src);
+ buf_init_str_const(&buf, src);
return json_buf_parse(&buf, dest);
}