jshn: shorten JSON_VAR to J_V
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
This commit is contained in:
parent
d59fa8d588
commit
0bfb44f590
2 changed files with 5 additions and 5 deletions
2
jshn.c
2
jshn.c
|
@ -260,7 +260,7 @@ static int jshn_format(bool no_newline, bool indent)
|
||||||
const char *output;
|
const char *output;
|
||||||
|
|
||||||
obj = json_object_new_object();
|
obj = json_object_new_object();
|
||||||
jshn_add_objects(obj, "JSON_VAR", false);
|
jshn_add_objects(obj, "J_V", false);
|
||||||
output = json_object_to_json_string(obj);
|
output = json_object_to_json_string(obj);
|
||||||
if (indent) {
|
if (indent) {
|
||||||
blob_buf_init(&b, 0);
|
blob_buf_init(&b, 0);
|
||||||
|
|
|
@ -105,7 +105,7 @@ json_cleanup() {
|
||||||
local unset tmp
|
local unset tmp
|
||||||
|
|
||||||
_json_get_var unset JSON_UNSET
|
_json_get_var unset JSON_UNSET
|
||||||
for tmp in $unset JSON_VAR; do
|
for tmp in $unset J_V; do
|
||||||
unset \
|
unset \
|
||||||
${JSON_PREFIX}U_$tmp \
|
${JSON_PREFIX}U_$tmp \
|
||||||
${JSON_PREFIX}K_$tmp \
|
${JSON_PREFIX}K_$tmp \
|
||||||
|
@ -125,8 +125,8 @@ json_init() {
|
||||||
json_cleanup
|
json_cleanup
|
||||||
export -n ${JSON_PREFIX}JSON_SEQ=0
|
export -n ${JSON_PREFIX}JSON_SEQ=0
|
||||||
export -- \
|
export -- \
|
||||||
${JSON_PREFIX}JSON_CUR="JSON_VAR" \
|
${JSON_PREFIX}JSON_CUR="J_V" \
|
||||||
${JSON_PREFIX}K_JSON_VAR=
|
${JSON_PREFIX}K_J_V=
|
||||||
}
|
}
|
||||||
|
|
||||||
json_add_object() {
|
json_add_object() {
|
||||||
|
@ -250,7 +250,7 @@ json_select() {
|
||||||
local cur
|
local cur
|
||||||
|
|
||||||
[ -z "$1" ] && {
|
[ -z "$1" ] && {
|
||||||
_json_set_var JSON_CUR "JSON_VAR"
|
_json_set_var JSON_CUR "J_V"
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
[[ "$1" == ".." ]] && {
|
[[ "$1" == ".." ]] && {
|
||||||
|
|
Loading…
Reference in a new issue