FGCOM/jansson
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make json_error_t transparent again

Browse Source 
After looking at the new code for a few days, I didn't like it
anymore. To prepare for the future, a few fields will be added to the
json_error_t struct later.

This reverts commit 23dd078c8d. Some
adjustments were needed because of newer commits.
This commit is contained in:
Petri Lehtinen
2010-10-26 21:05:40 +03:00
parent 198d537be7
commit bb5d4efb2e
8 changed files with 110 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/jansson.h
View File

@@ -87,10 +87,12 @@ void json_decref(json_t *json)
/* error reporting */
typedef struct json_error_t json_error_t;
#define JSON_ERROR_TEXT_LENGTH 160
const char *json_error_msg(const json_error_t *error);
int json_error_line(const json_error_t *error);
typedef struct {
char text[JSON_ERROR_TEXT_LENGTH];
int line;
} json_error_t;
/* getters, setters, manipulation */
@@ -164,8 +166,8 @@ int json_string_set_nocheck(json_t *string, const char *value);
int json_integer_set(json_t *integer, json_int_t value);
int json_real_set(json_t *real, double value);
json_t *json_pack(json_error_t **error, const char *fmt, ...);
int json_unpack(json_t *root, json_error_t **error, const char *fmt, ...);
json_t *json_pack(json_error_t *error, const char *fmt, ...);
int json_unpack(json_t *root, json_error_t *error, const char *fmt, ...);
/* equality */
@@ -180,9 +182,9 @@ json_t *json_deep_copy(json_t *value);
/* loading, printing */
json_t *json_loads(const char *input, size_t flags, json_error_t **error);
json_t *json_loadf(FILE *input, size_t flags, json_error_t **error);
json_t *json_load_file(const char *path, size_t flags, json_error_t **error);
json_t *json_loads(const char *input, size_t flags, json_error_t *error);
json_t *json_loadf(FILE *input, size_t flags, json_error_t *error);
json_t *json_load_file(const char *path, size_t flags, json_error_t *error);
#define JSON_INDENT(n) (n & 0x1F)
#define JSON_COMPACT 0x20

7
src/jansson_private.h
View File

@@ -63,11 +63,4 @@ typedef struct {
const object_key_t *jsonp_object_iter_fullkey(void *iter);
#define JSON_ERROR_MSG_LENGTH 160
struct json_error_t {
char msg[JSON_ERROR_MSG_LENGTH];
int line;
};
#endif

71
src/load.c
View File

@@ -60,64 +60,53 @@ typedef struct {
/*** error reporting ***/
const char *json_error_msg(const json_error_t *error)
{
return error ? error->msg : NULL;
}
int json_error_line(const json_error_t *error)
{
return error ? error->line : -1;
}
static void error_init(json_error_t **error)
static void error_init(json_error_t *error)
{
if(error)
*error = NULL;
{
error->text[0] = '\0';
error->line = -1;
}
}
static void error_set(json_error_t **error, const lex_t *lex,
static void error_set(json_error_t *error, const lex_t *lex,
const char *msg, ...)
{
va_list ap;
char text[JSON_ERROR_MSG_LENGTH];
char text[JSON_ERROR_TEXT_LENGTH];
if(!error || *error) {
/* error not given or already set */
if(!error || error->text[0] != '\0') {
/* error already set */
return;
}
*error = malloc(sizeof(json_error_t));
if(!(*error))
return;
va_start(ap, msg);
vsnprintf(text, JSON_ERROR_MSG_LENGTH, msg, ap);
vsnprintf(text, JSON_ERROR_TEXT_LENGTH, msg, ap);
va_end(ap);
if(lex)
{
const char *saved_text = strbuffer_value(&lex->saved_text);
(*error)->line = lex->line;
error->line = lex->line;
if(saved_text && saved_text[0])
{
if(lex->saved_text.length <= 20) {
snprintf((*error)->msg, JSON_ERROR_MSG_LENGTH,
snprintf(error->text, JSON_ERROR_TEXT_LENGTH,
"%s near '%s'", text, saved_text);
}
else
snprintf((*error)->msg, JSON_ERROR_MSG_LENGTH, "%s", text);
snprintf(error->text, JSON_ERROR_TEXT_LENGTH, "%s", text);
}
else
{
snprintf((*error)->msg, JSON_ERROR_MSG_LENGTH,
snprintf(error->text, JSON_ERROR_TEXT_LENGTH,
"%s near end of file", text);
}
}
else
{
(*error)->line = -1;
snprintf((*error)->msg, JSON_ERROR_MSG_LENGTH, "%s", text);
error->line = -1;
snprintf(error->text, JSON_ERROR_TEXT_LENGTH, "%s", text);
}
}
@@ -135,7 +124,7 @@ stream_init(stream_t *stream, get_func get, eof_func eof, void *data)
stream->buffer_pos = 0;
}
static char stream_get(stream_t *stream, json_error_t **error)
static char stream_get(stream_t *stream, json_error_t *error)
{
char c;
@@ -193,7 +182,7 @@ static void stream_unget(stream_t *stream, char c)
}
static int lex_get(lex_t *lex, json_error_t **error)
static int lex_get(lex_t *lex, json_error_t *error)
{
return stream_get(&lex->stream, error);
}
@@ -208,7 +197,7 @@ static void lex_save(lex_t *lex, char c)
strbuffer_append_byte(&lex->saved_text, c);
}
static int lex_get_save(lex_t *lex, json_error_t **error)
static int lex_get_save(lex_t *lex, json_error_t *error)
{
char c = stream_get(&lex->stream, error);
lex_save(lex, c);
@@ -256,7 +245,7 @@ static int32_t decode_unicode_escape(const char *str)
return value;
}
static void lex_scan_string(lex_t *lex, json_error_t **error)
static void lex_scan_string(lex_t *lex, json_error_t *error)
{
char c;
const char *p;
@@ -418,7 +407,7 @@ out:
#define json_strtoint strtol
#endif
static int lex_scan_number(lex_t *lex, char c, json_error_t **error)
static int lex_scan_number(lex_t *lex, char c, json_error_t *error)
{
const char *saved_text;
char *end;
@@ -515,7 +504,7 @@ out:
return -1;
}
static int lex_scan(lex_t *lex, json_error_t **error)
static int lex_scan(lex_t *lex, json_error_t *error)
{
char c;
@@ -621,9 +610,9 @@ static void lex_close(lex_t *lex)
/*** parser ***/
static json_t *parse_value(lex_t *lex, json_error_t **error);
static json_t *parse_value(lex_t *lex, json_error_t *error);
static json_t *parse_object(lex_t *lex, json_error_t **error)
static json_t *parse_object(lex_t *lex, json_error_t *error)
{
json_t *object = json_object();
if(!object)
@@ -688,7 +677,7 @@ error:
return NULL;
}
static json_t *parse_array(lex_t *lex, json_error_t **error)
static json_t *parse_array(lex_t *lex, json_error_t *error)
{
json_t *array = json_array();
if(!array)
@@ -728,7 +717,7 @@ error:
return NULL;
}
static json_t *parse_value(lex_t *lex, json_error_t **error)
static json_t *parse_value(lex_t *lex, json_error_t *error)
{
json_t *json;
@@ -783,7 +772,7 @@ static json_t *parse_value(lex_t *lex, json_error_t **error)
return json;
}
static json_t *parse_json(lex_t *lex, json_error_t **error)
static json_t *parse_json(lex_t *lex, json_error_t *error)
{
error_init(error);
@@ -822,7 +811,7 @@ static int string_eof(void *data)
return (stream->data[stream->pos] == '\0');
}
json_t *json_loads(const char *string, size_t flags, json_error_t **error)
json_t *json_loads(const char *string, size_t flags, json_error_t *error)
{
lex_t lex;
json_t *result;
@@ -849,7 +838,7 @@ out:
return result;
}
json_t *json_loadf(FILE *input, size_t flags, json_error_t **error)
json_t *json_loadf(FILE *input, size_t flags, json_error_t *error)
{
lex_t lex;
json_t *result;
@@ -874,7 +863,7 @@ out:
return result;
}
json_t *json_load_file(const char *path, size_t flags, json_error_t **error)
json_t *json_load_file(const char *path, size_t flags, json_error_t *error)
{
json_t *result;
FILE *fp;

29
src/variadic.c
View File

@@ -13,35 +13,32 @@
#include <jansson.h>
#include "jansson_private.h"
static void error_init(json_error_t **error)
static void error_init(json_error_t *error)
{
if(error)
*error = NULL;
{
error->text[0] = '\0';
error->line = -1;
}
}
static void error_set(json_error_t **error, const int line, const char *msg, ...)
static void error_set(json_error_t *error, const int line, const char *msg, ...)
{
va_list ap;
if(!error || *error)
if(!error || error->text[0] != '\0') {
/* error already set */
return;
}
*error = calloc(1, sizeof(json_error_t));
if(!*error)
return;
error->line = line;
va_start(ap, msg);
vsnprintf((*error)->msg, JSON_ERROR_MSG_LENGTH, msg, ap);
vsnprintf(error->text, JSON_ERROR_TEXT_LENGTH, msg, ap);
va_end(ap);
va_start(ap, msg);
vfprintf(stderr, msg, ap);
va_end(ap);
(*error)->line = line;
}
json_t *json_pack(json_error_t **error, const char *fmt, ...) {
json_t *json_pack(json_error_t *error, const char *fmt, ...) {
int fmt_length = strlen(fmt);
va_list ap;
@@ -286,7 +283,7 @@ out:
return(root);
}
int json_unpack(json_t *root, json_error_t **error, const char *fmt, ...) {
int json_unpack(json_t *root, json_error_t *error, const char *fmt, ...) {
va_list ap;
int rv=0; /* Return value */