Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-9859 libcfs: don't call unshare_fs_struct()
[fs/lustre-release.git]
/
lustre
/
utils
/
liblustreapi_json.c
diff --git
a/lustre/utils/liblustreapi_json.c
b/lustre/utils/liblustreapi_json.c
index
10e8e76
..
e19f25f
100644
(file)
--- 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.
*
*
* 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
*
* 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 <unistd.h>
#endif
-#include <libcfs/
libcfs
.h>
+#include <libcfs/
util/string
.h>
#include <lustre/lustreapi.h>
/** Quick-n'-dirty JSON string escape routine.
#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, "%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);
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;
if (new_item->lji_key == NULL)
return -ENOMEM;
- s
trlcpy(new_item->lji_key, key, len
);
+ s
nprintf(new_item->lji_key, len, "%s", key
);
new_item->lji_type = type;
new_item->lji_next = NULL;
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;
new_item->lji_string = calloc(len, sizeof(char));
if (new_item->lji_string == NULL)
return -ENOMEM;
- s
trlcpy(new_item->lji_string, (char *)val, len
);
+ s
nprintf(new_item->lji_string, len, "%s", (char *)val
);
break;
default:
llapi_err_noerrno(LLAPI_MSG_ERROR, "Unknown JSON type: %d",
break;
default:
llapi_err_noerrno(LLAPI_MSG_ERROR, "Unknown JSON type: %d",