| @@ -1457,7 +1457,7 @@ static int json_object_deep_copy_recursive(struct json_object *src, struct json_ | |||||
| if (shallow_copy_rc < 1) | if (shallow_copy_rc < 1) | ||||
| { | { | ||||
| errno = EINVAL; | errno = EINVAL; | ||||
| return -120; | |||||
| return -1; | |||||
| } | } | ||||
| assert(*dst != NULL); | assert(*dst != NULL); | ||||
| @@ -1471,13 +1471,13 @@ static int json_object_deep_copy_recursive(struct json_object *src, struct json_ | |||||
| else if (json_object_deep_copy_recursive(iter.val, src, iter.key, -1, &jso, shallow_copy) < 0) | else if (json_object_deep_copy_recursive(iter.val, src, iter.key, -1, &jso, shallow_copy) < 0) | ||||
| { | { | ||||
| json_object_put(jso); | json_object_put(jso); | ||||
| return -130; | |||||
| return -1; | |||||
| } | } | ||||
| if (json_object_object_add(*dst, iter.key, jso) < 0) | if (json_object_object_add(*dst, iter.key, jso) < 0) | ||||
| { | { | ||||
| json_object_put(jso); | json_object_put(jso); | ||||
| return -140; | |||||
| return -1; | |||||
| } | } | ||||
| } | } | ||||
| break; | break; | ||||
| @@ -1493,13 +1493,13 @@ static int json_object_deep_copy_recursive(struct json_object *src, struct json_ | |||||
| else if (json_object_deep_copy_recursive(jso1, src, NULL, ii, &jso, shallow_copy) < 0) | else if (json_object_deep_copy_recursive(jso1, src, NULL, ii, &jso, shallow_copy) < 0) | ||||
| { | { | ||||
| json_object_put(jso); | json_object_put(jso); | ||||
| return -150; | |||||
| return -1; | |||||
| } | } | ||||
| if (json_object_array_add(*dst, jso) < 0) | if (json_object_array_add(*dst, jso) < 0) | ||||
| { | { | ||||
| json_object_put(jso); | json_object_put(jso); | ||||
| return -160; | |||||
| return -1; | |||||
| } | } | ||||
| } | } | ||||
| break; | break; | ||||
| @@ -1522,15 +1522,15 @@ int json_object_deep_copy(struct json_object *src, struct json_object **dst, jso | |||||
| /* Check if arguments are sane ; *dst must not point to a non-NULL object */ | /* Check if arguments are sane ; *dst must not point to a non-NULL object */ | ||||
| if (!src) { | if (!src) { | ||||
| errno = EINVAL; | errno = EINVAL; | ||||
| return -101; | |||||
| return -1; | |||||
| } | } | ||||
| if (!dst) { | if (!dst) { | ||||
| errno = EINVAL; | errno = EINVAL; | ||||
| return -102; | |||||
| return -1; | |||||
| } | } | ||||
| if (*dst) { | if (*dst) { | ||||
| errno = EINVAL; | errno = EINVAL; | ||||
| return -103; | |||||
| return -1; | |||||
| } | } | ||||
| if (shallow_copy == NULL) | if (shallow_copy == NULL) | ||||
| @@ -0,0 +1,43 @@ | |||||
| test_basic_printbuf_memset: starting test | |||||
| Buffer contents:blue:1xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx | |||||
| test_basic_printbuf_memset: end test | |||||
| ======================================== | |||||
| test_printbuf_memset_length: starting test | |||||
| Buffer length: 0 | |||||
| Buffer length: 12 | |||||
| Buffer length: 18 | |||||
| Buffer length: 76 | |||||
| Buffer length: 76 | |||||
| Buffer length: 77 | |||||
| test_printbuf_memset_length: end test | |||||
| ======================================== | |||||
| test_printbuf_memappend: starting test | |||||
| Buffer length: 0 | |||||
| Appended 256 bytes for resize: [xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx] | |||||
| Partial append: 3, [blu] | |||||
| With embedded \0 character: 4, [ab] | |||||
| Append to just before resize: 255, [XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX] | |||||
| Append to just after resize: 256, [XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX] | |||||
| Buffer size after printbuf_strappend(): 16, [XXXXXXXXXXXXXXXX] | |||||
| test_printbuf_memappend: end test | |||||
| ======================================== | |||||
| test_sprintbuf: starting test | |||||
| Buffer length: 0 | |||||
| sprintbuf to just after resize(255+1): 256, [XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX], strlen(buf)=256 | |||||
| 5, [plain] | |||||
| 6, [plain] | |||||
| 16, [plain] | |||||
| 27, [plain] | |||||
| 29, [plain] | |||||
| test_sprintbuf: end test | |||||
| ======================================== | |||||
| test_sprintbuf2: starting test | |||||
| Buffer length: 0 | |||||
| sprintbuf to just after resize(255+1): 256, [XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX], strlen(buf)=256 | |||||
| 5, [plain] | |||||
| 6, [plain] | |||||
| 16, [plain] | |||||
| 27, [plain] | |||||
| 29, [plain] | |||||
| test_sprintbuf2: end test | |||||
| ======================================== | |||||