X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fliblustreapi_json.c;h=e19f25ff821f20140ec1b661fa51358975e0e39d;hb=186b97e68abbc45c0e8d5ae7e2a0d10aaa918db6;hp=10e8e76d48e93aeb9d2cd432d1cb0690d7319262;hpb=21d716e6c16424d9deb646456758ebbaa9c70fec;p=fs%2Flustre-release.git diff --git a/lustre/utils/liblustreapi_json.c b/lustre/utils/liblustreapi_json.c index 10e8e76..e19f25f 100644 --- a/lustre/utils/liblustreapi_json.c +++ b/lustre/utils/liblustreapi_json.c @@ -3,7 +3,7 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * (C) Copyright 2014 Intel Corporation. + * Copyright (c) 2014, Intel Corporation. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU Lesser General Public License @@ -41,7 +41,7 @@ #include #endif -#include +#include #include /** Quick-n'-dirty JSON string escape routine. @@ -141,7 +141,7 @@ int llapi_json_write_list(struct llapi_json_item_list **json_items, FILE *fp) fprintf(fp, "%d", item->lji_integer); break; case LLAPI_JSON_BIGNUM: - fprintf(fp, LPU64, item->lji_u64); + fprintf(fp, "%llu", (unsigned long long)item->lji_u64); break; case LLAPI_JSON_REAL: fprintf(fp, "%f", item->lji_real); @@ -276,7 +276,7 @@ int llapi_json_add_item(struct llapi_json_item_list **json_items, if (new_item->lji_key == NULL) return -ENOMEM; - strlcpy(new_item->lji_key, key, len); + snprintf(new_item->lji_key, len, "%s", key); new_item->lji_type = type; new_item->lji_next = NULL; @@ -295,7 +295,7 @@ int llapi_json_add_item(struct llapi_json_item_list **json_items, new_item->lji_string = calloc(len, sizeof(char)); if (new_item->lji_string == NULL) return -ENOMEM; - strlcpy(new_item->lji_string, (char *)val, len); + snprintf(new_item->lji_string, len, "%s", (char *)val); break; default: llapi_err_noerrno(LLAPI_MSG_ERROR, "Unknown JSON type: %d",