X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Futils%2Fliblustreapi_json.c;h=e19f25ff821f20140ec1b661fa51358975e0e39d;hb=f843facff59226d3788d855d1d6948523ab8d944;hp=a09a1e0fa24d0994ed29a51f0b28be5bd591b232;hpb=8bad2c91692e570bb3c8bfa36e053dc4bc72a292;p=fs%2Flustre-release.git

diff --git a/lustre/utils/liblustreapi_json.c b/lustre/utils/liblustreapi_json.c
index a09a1e0..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 <unistd.h>
 #endif
 
-#include <liblustre.h>
+#include <libcfs/util/string.h>
 #include <lustre/lustreapi.h>
 
 /** 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);
@@ -257,6 +257,7 @@ int llapi_json_add_item(struct llapi_json_item_list **json_items,
 {
 	struct llapi_json_item_list	*list;
 	struct llapi_json_item		*new_item;
+	size_t len;
 
 	if (json_items == NULL || *json_items == NULL)
 		return -EINVAL;
@@ -270,11 +271,12 @@ int llapi_json_add_item(struct llapi_json_item_list **json_items,
 	if (new_item == NULL)
 		return -ENOMEM;
 
-	new_item->lji_key = calloc(1, strlen(key) + 1);
+	len = strlen(key) + 1;
+	new_item->lji_key = calloc(len, sizeof(char));
 	if (new_item->lji_key == NULL)
 		return -ENOMEM;
 
-	strncpy(new_item->lji_key, key, strlen(key));
+	snprintf(new_item->lji_key, len, "%s", key);
 	new_item->lji_type = type;
 	new_item->lji_next = NULL;
 
@@ -289,11 +291,11 @@ int llapi_json_add_item(struct llapi_json_item_list **json_items,
 		new_item->lji_real = *(double *)val;
 		break;
 	case LLAPI_JSON_STRING:
-		new_item->lji_string = calloc(1, strlen((char *)val) + 1);
+		len = strlen((char *)val) + 1;
+		new_item->lji_string = calloc(len, sizeof(char));
 		if (new_item->lji_string == NULL)
 			return -ENOMEM;
-		strncpy(new_item->lji_string,
-			(char *)val, strlen((char *)val));
+		snprintf(new_item->lji_string, len, "%s", (char *)val);
 		break;
 	default:
 		llapi_err_noerrno(LLAPI_MSG_ERROR, "Unknown JSON type: %d",