summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ext/json/fbuffer/fbuffer.h17
-rw-r--r--ext/json/generator/generator.c17
-rw-r--r--ext/json/generator/generator.h9
-rw-r--r--ext/json/parser/parser.c24
-rw-r--r--ext/json/parser/parser.h2
-rw-r--r--ext/json/parser/parser.rl24
6 files changed, 39 insertions, 54 deletions
diff --git a/ext/json/fbuffer/fbuffer.h b/ext/json/fbuffer/fbuffer.h
index 4dec507347..dc09dde9cb 100644
--- a/ext/json/fbuffer/fbuffer.h
+++ b/ext/json/fbuffer/fbuffer.h
@@ -13,12 +13,11 @@ typedef struct FBufferStruct {
#define FBUFFER_INITIAL_LENGTH_DEFAULT 1024
-#define FBUFFER_PTR(fb) (fb->ptr)
-#define FBUFFER_LEN(fb) (fb->len)
-#define FBUFFER_CAPA(fb) (fb->capa)
+#define FBUFFER_PTR(fb) ((fb)->ptr)
+#define FBUFFER_LEN(fb) ((fb)->len)
+#define FBUFFER_CAPA(fb) ((fb)->capa)
#define FBUFFER_PAIR(fb) FBUFFER_PTR(fb), FBUFFER_LEN(fb)
-static FBuffer *fbuffer_alloc(unsigned long initial_length);
static void fbuffer_free(FBuffer *fb);
#ifndef JSON_GENERATOR
static void fbuffer_clear(FBuffer *fb);
@@ -36,20 +35,14 @@ static VALUE fbuffer_to_s(FBuffer *fb);
#define RB_UNLIKELY(expr) expr
#endif
-static FBuffer *fbuffer_alloc(unsigned long initial_length)
+static void fbuffer_init(FBuffer *fb, unsigned long initial_length)
{
- FBuffer *fb;
- if (initial_length <= 0) initial_length = FBUFFER_INITIAL_LENGTH_DEFAULT;
- fb = ALLOC(FBuffer);
- memset((void *) fb, 0, sizeof(FBuffer));
- fb->initial_length = initial_length;
- return fb;
+ fb->initial_length = (initial_length > 0) ? initial_length : FBUFFER_INITIAL_LENGTH_DEFAULT;
}
static void fbuffer_free(FBuffer *fb)
{
if (fb->ptr) ruby_xfree(fb->ptr);
- ruby_xfree(fb);
}
#ifndef JSON_GENERATOR
diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c
index 3f2d91ffa4..0d70b12173 100644
--- a/ext/json/generator/generator.c
+++ b/ext/json/generator/generator.c
@@ -911,15 +911,6 @@ static void generate_json(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *s
}
}
-static FBuffer *cState_prepare_buffer(VALUE self)
-{
- FBuffer *buffer;
- GET_STATE(self);
- buffer = fbuffer_alloc(state->buffer_initial_length);
-
- return buffer;
-}
-
struct generate_json_data {
FBuffer *buffer;
VALUE vstate;
@@ -948,18 +939,20 @@ static VALUE generate_json_rescue(VALUE d, VALUE exc)
static VALUE cState_partial_generate(VALUE self, VALUE obj)
{
- FBuffer *buffer = cState_prepare_buffer(self);
GET_STATE(self);
+ FBuffer buffer = {0};
+ fbuffer_init(&buffer, state->buffer_initial_length);
+
struct generate_json_data data = {
- .buffer = buffer,
+ .buffer = &buffer,
.vstate = self,
.state = state,
.obj = obj
};
rb_rescue(generate_json_try, (VALUE)&data, generate_json_rescue, (VALUE)&data);
- return fbuffer_to_s(buffer);
+ return fbuffer_to_s(&buffer);
}
/*
diff --git a/ext/json/generator/generator.h b/ext/json/generator/generator.h
index 3710ce7c22..230c08a64d 100644
--- a/ext/json/generator/generator.h
+++ b/ext/json/generator/generator.h
@@ -55,16 +55,16 @@ typedef struct JSON_Generator_StateStruct {
GET_STATE_TO(self, state)
#define GENERATE_JSON(type) \
- FBuffer *buffer; \
VALUE Vstate; \
JSON_Generator_State *state; \
\
rb_scan_args(argc, argv, "01", &Vstate); \
Vstate = cState_from_state_s(cState, Vstate); \
TypedData_Get_Struct(Vstate, JSON_Generator_State, &JSON_Generator_State_type, state); \
- buffer = cState_prepare_buffer(Vstate); \
- generate_json_##type(buffer, Vstate, state, self); \
- return fbuffer_to_s(buffer)
+ FBuffer buffer = {0}; \
+ fbuffer_init(&buffer, state->buffer_initial_length); \
+ generate_json_##type(&buffer, Vstate, state, self); \
+ return fbuffer_to_s(&buffer)
static VALUE mHash_to_json(int argc, VALUE *argv, VALUE self);
static VALUE mArray_to_json(int argc, VALUE *argv, VALUE self);
@@ -122,7 +122,6 @@ static VALUE cState_script_safe(VALUE self);
static VALUE cState_script_safe_set(VALUE self, VALUE depth);
static VALUE cState_strict(VALUE self);
static VALUE cState_strict_set(VALUE self, VALUE strict);
-static FBuffer *cState_prepare_buffer(VALUE self);
static const rb_data_type_t JSON_Generator_State_type;
diff --git a/ext/json/parser/parser.c b/ext/json/parser/parser.c
index cf0b3cefa4..ce40ddd442 100644
--- a/ext/json/parser/parser.c
+++ b/ext/json/parser/parser.c
@@ -972,10 +972,10 @@ case 5:
if (cs >= JSON_integer_first_final) {
long len = p - json->memo;
- fbuffer_clear(json->fbuffer);
- fbuffer_append(json->fbuffer, json->memo, len);
- fbuffer_append_char(json->fbuffer, '\0');
- *result = rb_cstr2inum(FBUFFER_PTR(json->fbuffer), 10);
+ fbuffer_clear(&json->fbuffer);
+ fbuffer_append(&json->fbuffer, json->memo, len);
+ fbuffer_append_char(&json->fbuffer, '\0');
+ *result = rb_cstr2inum(FBUFFER_PTR(&json->fbuffer), 10);
return p + 1;
} else {
return NULL;
@@ -1167,15 +1167,15 @@ case 7:
}
long len = p - json->memo;
- fbuffer_clear(json->fbuffer);
- fbuffer_append(json->fbuffer, json->memo, len);
- fbuffer_append_char(json->fbuffer, '\0');
+ fbuffer_clear(&json->fbuffer);
+ fbuffer_append(&json->fbuffer, json->memo, len);
+ fbuffer_append_char(&json->fbuffer, '\0');
if (method_id) {
- VALUE text = rb_str_new2(FBUFFER_PTR(json->fbuffer));
+ VALUE text = rb_str_new2(FBUFFER_PTR(&json->fbuffer));
*result = rb_funcallv(mod, method_id, 1, &text);
} else {
- *result = DBL2NUM(rb_cstr_to_dbl(FBUFFER_PTR(json->fbuffer), 1));
+ *result = DBL2NUM(rb_cstr_to_dbl(FBUFFER_PTR(&json->fbuffer), 1));
}
return p + 1;
@@ -2138,14 +2138,14 @@ static void JSON_mark(void *ptr)
static void JSON_free(void *ptr)
{
JSON_Parser *json = ptr;
- fbuffer_free(json->fbuffer);
+ fbuffer_free(&json->fbuffer);
ruby_xfree(json);
}
static size_t JSON_memsize(const void *ptr)
{
const JSON_Parser *json = ptr;
- return sizeof(*json) + FBUFFER_CAPA(json->fbuffer);
+ return sizeof(*json) + FBUFFER_CAPA(&json->fbuffer);
}
static const rb_data_type_t JSON_Parser_type = {
@@ -2159,7 +2159,7 @@ static VALUE cJSON_parser_s_allocate(VALUE klass)
{
JSON_Parser *json;
VALUE obj = TypedData_Make_Struct(klass, JSON_Parser, &JSON_Parser_type, json);
- json->fbuffer = fbuffer_alloc(0);
+ fbuffer_init(&json->fbuffer, 0);
return obj;
}
diff --git a/ext/json/parser/parser.h b/ext/json/parser/parser.h
index 59c502b226..2a5b13856a 100644
--- a/ext/json/parser/parser.h
+++ b/ext/json/parser/parser.h
@@ -19,7 +19,7 @@ typedef struct JSON_ParserStruct {
VALUE array_class;
VALUE decimal_class;
VALUE match_string;
- FBuffer *fbuffer;
+ FBuffer fbuffer;
int max_nesting;
char allow_nan;
char parsing_name;
diff --git a/ext/json/parser/parser.rl b/ext/json/parser/parser.rl
index 73f81341ab..430f3c45b3 100644
--- a/ext/json/parser/parser.rl
+++ b/ext/json/parser/parser.rl
@@ -324,10 +324,10 @@ static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *res
if (cs >= JSON_integer_first_final) {
long len = p - json->memo;
- fbuffer_clear(json->fbuffer);
- fbuffer_append(json->fbuffer, json->memo, len);
- fbuffer_append_char(json->fbuffer, '\0');
- *result = rb_cstr2inum(FBUFFER_PTR(json->fbuffer), 10);
+ fbuffer_clear(&json->fbuffer);
+ fbuffer_append(&json->fbuffer, json->memo, len);
+ fbuffer_append_char(&json->fbuffer, '\0');
+ *result = rb_cstr2inum(FBUFFER_PTR(&json->fbuffer), 10);
return p + 1;
} else {
return NULL;
@@ -388,15 +388,15 @@ static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *resul
}
long len = p - json->memo;
- fbuffer_clear(json->fbuffer);
- fbuffer_append(json->fbuffer, json->memo, len);
- fbuffer_append_char(json->fbuffer, '\0');
+ fbuffer_clear(&json->fbuffer);
+ fbuffer_append(&json->fbuffer, json->memo, len);
+ fbuffer_append_char(&json->fbuffer, '\0');
if (method_id) {
- VALUE text = rb_str_new2(FBUFFER_PTR(json->fbuffer));
+ VALUE text = rb_str_new2(FBUFFER_PTR(&json->fbuffer));
*result = rb_funcallv(mod, method_id, 1, &text);
} else {
- *result = DBL2NUM(rb_cstr_to_dbl(FBUFFER_PTR(json->fbuffer), 1));
+ *result = DBL2NUM(rb_cstr_to_dbl(FBUFFER_PTR(&json->fbuffer), 1));
}
return p + 1;
@@ -898,14 +898,14 @@ static void JSON_mark(void *ptr)
static void JSON_free(void *ptr)
{
JSON_Parser *json = ptr;
- fbuffer_free(json->fbuffer);
+ fbuffer_free(&json->fbuffer);
ruby_xfree(json);
}
static size_t JSON_memsize(const void *ptr)
{
const JSON_Parser *json = ptr;
- return sizeof(*json) + FBUFFER_CAPA(json->fbuffer);
+ return sizeof(*json) + FBUFFER_CAPA(&json->fbuffer);
}
static const rb_data_type_t JSON_Parser_type = {
@@ -919,7 +919,7 @@ static VALUE cJSON_parser_s_allocate(VALUE klass)
{
JSON_Parser *json;
VALUE obj = TypedData_Make_Struct(klass, JSON_Parser, &JSON_Parser_type, json);
- json->fbuffer = fbuffer_alloc(0);
+ fbuffer_init(&json->fbuffer, 0);
return obj;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-19 05:42:22 +0000