aboutsummaryrefslogtreecommitdiff
path: root/loader/cJSON.c
diff options
context:
space:
mode:
authorKarl Schultz <karl@lunarg.com>2016-02-24 14:39:39 -0700
committerKarl Schultz <karl@lunarg.com>2016-02-24 17:49:55 -0700
commit94663121070530eb516afdac083a689e297b1925 (patch)
tree12db4ba3b0cc4f6c9df48143634c6ed933a3c208 /loader/cJSON.c
parentfcc5996a1f0f018160968f9e888b11f132c5e8d0 (diff)
downloadusermoji-94663121070530eb516afdac083a689e297b1925.tar.xz
loader: Fix MSVS warnings
Apply branch 'fix-warnings' of https://github.com/null77/Vulkan-LoaderAndValidationLayers into null77-fix-warnings
Diffstat (limited to 'loader/cJSON.c')
-rw-r--r--loader/cJSON.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/loader/cJSON.c b/loader/cJSON.c
index 09786603..f28eadb7 100644
--- a/loader/cJSON.c
+++ b/loader/cJSON.c
@@ -343,7 +343,7 @@ static const char *parse_string(cJSON *item, const char *str) {
*--ptr2 = ((uc | 0x80) & 0xBF);
uc >>= 6;
case 1:
- *--ptr2 = (uc | firstByteMark[len]);
+ *--ptr2 = ((unsigned char)uc | firstByteMark[len]);
}
ptr2 += len;
break;
@@ -521,7 +521,6 @@ char *cJSON_PrintBuffered(cJSON *item, int prebuffer, int fmt) {
p.length = prebuffer;
p.offset = 0;
return print_value(item, 0, fmt, &p);
- return p.buffer;
}
/* Parser core - when encountering text, process appropriately. */