d3fa561e5a
The current blobmsg_format_json* functions will return invalid JSON when the "list" argument is given as false (blobmsg_format_element() will output the name of the blob_attr as if the value is printed as part of a JSON object). To avoid breaking software relying on this behaviour, introduce new functions which will never print the blob_attr name and thus always produce valid JSON. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> Acked-by: Jo-Philipp Wich <jo@mein.io> Signed-off-by: Felix Fietkau <nbd@nbd.name> [cosmetic style fix]
59 lines
2.1 KiB
C
59 lines
2.1 KiB
C
/*
|
|
* Copyright (C) 2010-2012 Felix Fietkau <nbd@openwrt.org>
|
|
*
|
|
* Permission to use, copy, modify, and/or distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
#ifndef __BLOBMSG_JSON_H
|
|
#define __BLOBMSG_JSON_H
|
|
|
|
struct json_object;
|
|
|
|
#include <stdbool.h>
|
|
#include "blobmsg.h"
|
|
|
|
bool blobmsg_add_object(struct blob_buf *b, struct json_object *obj);
|
|
bool blobmsg_add_json_element(struct blob_buf *b, const char *name, struct json_object *obj);
|
|
bool blobmsg_add_json_from_string(struct blob_buf *b, const char *str);
|
|
bool blobmsg_add_json_from_file(struct blob_buf *b, const char *file);
|
|
|
|
typedef const char *(*blobmsg_json_format_t)(void *priv, struct blob_attr *attr);
|
|
|
|
char *blobmsg_format_json_with_cb(struct blob_attr *attr, bool list,
|
|
blobmsg_json_format_t cb, void *priv,
|
|
int indent);
|
|
|
|
static inline char *blobmsg_format_json(struct blob_attr *attr, bool list)
|
|
{
|
|
return blobmsg_format_json_with_cb(attr, list, NULL, NULL, -1);
|
|
}
|
|
|
|
static inline char *blobmsg_format_json_indent(struct blob_attr *attr, bool list, int indent)
|
|
{
|
|
return blobmsg_format_json_with_cb(attr, list, NULL, NULL, indent);
|
|
}
|
|
|
|
char *blobmsg_format_json_value_with_cb(struct blob_attr *attr,
|
|
blobmsg_json_format_t cb, void *priv,
|
|
int indent);
|
|
|
|
static inline char *blobmsg_format_json_value(struct blob_attr *attr)
|
|
{
|
|
return blobmsg_format_json_value_with_cb(attr, NULL, NULL, -1);
|
|
}
|
|
|
|
static inline char *blobmsg_format_json_value_indent(struct blob_attr *attr, int indent)
|
|
{
|
|
return blobmsg_format_json_value_with_cb(attr, NULL, NULL, indent);
|
|
}
|
|
|
|
#endif
|