@@ -421,7 +421,6 @@ static void State_free(void *ptr)
421
421
if (state -> space_before ) ruby_xfree (state -> space_before );
422
422
if (state -> object_nl ) ruby_xfree (state -> object_nl );
423
423
if (state -> array_nl ) ruby_xfree (state -> array_nl );
424
- if (state -> object_delim ) fbuffer_free (state -> object_delim );
425
424
if (state -> object_delim2 ) fbuffer_free (state -> object_delim2 );
426
425
ruby_xfree (state );
427
426
}
@@ -435,7 +434,6 @@ static size_t State_memsize(const void *ptr)
435
434
if (state -> space_before ) size += state -> space_before_len + 1 ;
436
435
if (state -> object_nl ) size += state -> object_nl_len + 1 ;
437
436
if (state -> array_nl ) size += state -> array_nl_len + 1 ;
438
- if (state -> object_delim ) size += FBUFFER_CAPA (state -> object_delim );
439
437
if (state -> object_delim2 ) size += FBUFFER_CAPA (state -> object_delim2 );
440
438
return size ;
441
439
}
@@ -650,14 +648,12 @@ json_object_i(VALUE key, VALUE val, VALUE _arg)
650
648
long object_nl_len = state -> object_nl_len ;
651
649
char * indent = state -> indent ;
652
650
long indent_len = state -> indent_len ;
653
- char * delim = FBUFFER_PTR (state -> object_delim );
654
- long delim_len = FBUFFER_LEN (state -> object_delim );
655
651
char * delim2 = FBUFFER_PTR (state -> object_delim2 );
656
652
long delim2_len = FBUFFER_LEN (state -> object_delim2 );
657
653
long depth = state -> depth ;
658
654
int j ;
659
655
660
- if (arg -> iter > 0 ) fbuffer_append (buffer , delim , delim_len );
656
+ if (arg -> iter > 0 ) fbuffer_append_char (buffer , ',' );
661
657
if (object_nl ) {
662
658
fbuffer_append (buffer , object_nl , object_nl_len );
663
659
}
@@ -889,12 +885,6 @@ static FBuffer *cState_prepare_buffer(VALUE self)
889
885
GET_STATE (self );
890
886
buffer = fbuffer_alloc (state -> buffer_initial_length );
891
887
892
- if (state -> object_delim ) {
893
- fbuffer_clear (state -> object_delim );
894
- } else {
895
- state -> object_delim = fbuffer_alloc (16 );
896
- }
897
- fbuffer_append_char (state -> object_delim , ',' );
898
888
if (state -> object_delim2 ) {
899
889
fbuffer_clear (state -> object_delim2 );
900
890
} else {
@@ -1016,7 +1006,6 @@ static VALUE cState_init_copy(VALUE obj, VALUE orig)
1016
1006
objState -> space_before = fstrndup (origState -> space_before , origState -> space_before_len );
1017
1007
objState -> object_nl = fstrndup (origState -> object_nl , origState -> object_nl_len );
1018
1008
objState -> array_nl = fstrndup (origState -> array_nl , origState -> array_nl_len );
1019
- if (origState -> object_delim ) objState -> object_delim = fbuffer_dup (origState -> object_delim );
1020
1009
if (origState -> object_delim2 ) objState -> object_delim2 = fbuffer_dup (origState -> object_delim2 );
1021
1010
return obj ;
1022
1011
}
0 commit comments