oj 3.14.2 → 3.14.3

data/ext/oj/mimic_json.c

@@ -1,9 +1,9 @@
 // Copyright (c) 2012, 2017 Peter Ohler. All rights reserved.
 // Licensed under the MIT License. See LICENSE file in the project root for license details.
 
-#include "mem.h"
 #include "dump.h"
 #include "encode.h"
+#include "mem.h"
 #include "oj.h"
 #include "parse.h"
 
@@ -349,12 +349,11 @@ static VALUE mimic_load(int argc, VALUE *argv, VALUE self) {
 static VALUE mimic_dump_load(int argc, VALUE *argv, VALUE self) {
     if (1 > argc) {
         rb_raise(rb_eArgError, "wrong number of arguments (0 for 1)");
-    } else if (T_STRING == rb_type(*argv)) {
+    }
+    if (T_STRING == rb_type(*argv)) {
         return mimic_load(argc, argv, self);
-    } else {
-        return mimic_dump(argc, argv, self);
     }
-    return Qnil;
+    return mimic_dump(argc, argv, self);
 }
 
 static VALUE mimic_generate_core(int argc, VALUE *argv, Options copts) {
@@ -368,8 +367,8 @@ static VALUE mimic_generate_core(int argc, VALUE *argv, Options copts) {
 
     oj_out_init(&out);
 
-    out.omit_nil  = copts->dump_opts.omit_nil;
-    out.caller    = CALLER_GENERATE;
+    out.omit_nil = copts->dump_opts.omit_nil;
+    out.caller   = CALLER_GENERATE;
     // For obj.to_json or generate nan is not allowed but if called from dump
     // it is.
     copts->dump_opts.nan_dump = RaiseNan;
@@ -389,10 +388,8 @@ static VALUE mimic_generate_core(int argc, VALUE *argv, Options copts) {
         VALUE active_hack[1];
 
         if (Qundef == state_class) {
-            rb_warn(
-              "Oj::Rails.mimic_JSON was called implicitly. "
-              "Call it explicitly beforehand if you want to remove this warning."
-            );
+            rb_warn("Oj::Rails.mimic_JSON was called implicitly. "
+                    "Call it explicitly beforehand if you want to remove this warning.");
             oj_define_mimic_json(0, NULL, Qnil);
         }
         active_hack[0] = rb_funcall(state_class, oj_new_id, 0);
@@ -467,7 +464,7 @@ oj_mimic_pretty_generate(int argc, VALUE *argv, VALUE self) {
     }
     if (1 == argc || Qnil == argv[1]) {
         h = rb_hash_new();
-    } else  {
+    } else {
         h = argv[1];
     }
     if (!oj_hash_has_key(h, oj_indent_sym)) {
@@ -486,10 +483,8 @@ oj_mimic_pretty_generate(int argc, VALUE *argv, VALUE self) {
         rb_hash_aset(h, oj_array_nl_sym, rb_str_new2("\n"));
     }
     if (Qundef == state_class) {
-        rb_warn(
-          "Oj::Rails.mimic_JSON was called implicitly. "
-          "Call it explicitly beforehand if you want to remove this warning."
-        );
+        rb_warn("Oj::Rails.mimic_JSON was called implicitly. "
+                "Call it explicitly beforehand if you want to remove this warning.");
         oj_define_mimic_json(0, NULL, Qnil);
     }
     rargs[1] = rb_funcall(state_class, oj_new_id, 1, h);
@@ -658,11 +653,9 @@ static VALUE mimic_recurse_proc(VALUE self, VALUE obj) {
  *
  * - *id* [_nil_|String] new create_id
  *
- * Returns [_String_] the id.
+ * Returns [_nil_|_String_] the id.
  */
 static VALUE mimic_set_create_id(VALUE self, VALUE id) {
-    Check_Type(id, T_STRING);
-
     if (NULL != oj_default_options.create_id) {
         if (oj_json_class != oj_default_options.create_id) {
             OJ_R_FREE((char *)oj_default_options.create_id);
@@ -671,10 +664,11 @@ static VALUE mimic_set_create_id(VALUE self, VALUE id) {
         oj_default_options.create_id_len = 0;
     }
     if (Qnil != id) {
-        size_t len = RSTRING_LEN(id) + 1;
+        const char *ptr = StringValueCStr(id);
+        size_t      len = RSTRING_LEN(id) + 1;
 
         oj_default_options.create_id = OJ_R_ALLOC_N(char, len);
-        strcpy((char *)oj_default_options.create_id, StringValuePtr(id));
+        strcpy((char *)oj_default_options.create_id, ptr);
         oj_default_options.create_id_len = len - 1;
     }
     return id;
@@ -763,9 +757,9 @@ static VALUE mimic_object_to_json(int argc, VALUE *argv, VALUE self) {
 
     oj_out_init(&out);
 
-    out.omit_nil      = copts.dump_opts.omit_nil;
-    copts.mode        = CompatMode;
-    copts.to_json     = No;
+    out.omit_nil  = copts.dump_opts.omit_nil;
+    copts.mode    = CompatMode;
+    copts.to_json = No;
     if (1 <= argc && Qnil != argv[0]) {
         oj_parse_mimic_dump_options(argv[0], &copts);
     }

data/ext/oj/object.c

@@ -270,8 +270,8 @@ static int hat_num(ParseInfo pi, Val parent, Val kval, NumInfo ni) {
                     parent->val = rb_funcall2(parent->val, oj_utc_id, 0, 0);
                 } else if (ni->has_exp) {
                     struct timespec ts;
-                    ts.tv_sec = ni->i;
-                    ts.tv_nsec = nsec;
+                    ts.tv_sec   = ni->i;
+                    ts.tv_nsec  = nsec;
                     parent->val = rb_time_timespec_new(&ts, (int)ni->exp);
                 } else {
                     parent->val = rb_time_nano_new(ni->i, (long)nsec);
@@ -325,14 +325,14 @@ static int hat_value(ParseInfo pi, Val parent, const char *key, size_t klen, vol
                 sc = oj_name2struct(pi, *RARRAY_CONST_PTR(value), rb_eArgError);
             }
             if (sc == rb_cRange) {
-              parent->val = rb_class_new_instance(len - 1, RARRAY_CONST_PTR(value) + 1, rb_cRange);
+                parent->val = rb_class_new_instance(len - 1, RARRAY_CONST_PTR(value) + 1, rb_cRange);
             } else {
                 // Create a properly initialized struct instance without calling the initialize method.
                 parent->val = rb_obj_alloc(sc);
                 // If the JSON array has more entries than the struct class allows, we record an error.
 #ifdef RSTRUCT_LEN
 #if RSTRUCT_LEN_RETURNS_INTEGER_OBJECT
-            slen = (int)NUM2LONG(RSTRUCT_LEN(parent->val));
+                slen = (int)NUM2LONG(RSTRUCT_LEN(parent->val));
 #else   // RSTRUCT_LEN_RETURNS_INTEGER_OBJECT
                 slen = (int)RSTRUCT_LEN(parent->val);
 #endif  // RSTRUCT_LEN_RETURNS_INTEGER_OBJECT
@@ -545,7 +545,7 @@ WHICH_TYPE:
             }
         } else {
             if (3 <= klen && '^' == *key && '#' == key[1] && T_ARRAY == rb_type(value)) {
-                long            len = RARRAY_LEN(value);
+                long                  len = RARRAY_LEN(value);
                 volatile const VALUE *a   = RARRAY_CONST_PTR(value);
 
                 if (2 != len) {

data/ext/oj/odd.c

@@ -1,11 +1,12 @@
 // Copyright (c) 2011 Peter Ohler. All rights reserved.
 // Licensed under the MIT License. See LICENSE file in the project root for license details.
 
-#include "mem.h"
 #include "odd.h"
 
 #include <string.h>
 
+#include "mem.h"
+
 static Odd odds = NULL;
 static ID  sec_id;
 static ID  sec_fraction_id;

data/ext/oj/odd.h

@@ -14,7 +14,7 @@ typedef VALUE (*AttrGetFunc)(VALUE obj);
 
 typedef struct _odd {
     struct _odd *next;
-    const char * classname;
+    const char  *classname;
     size_t       clen;
     VALUE        clas;  // Ruby class or module
     VALUE        create_obj;
@@ -22,15 +22,15 @@ typedef struct _odd {
     int          attr_cnt;
     bool         is_module;
     bool         raw;
-    const char * attr_names[MAX_ODD_ARGS];  // NULL terminated attr names
+    const char  *attr_names[MAX_ODD_ARGS];  // NULL terminated attr names
     ID           attrs[MAX_ODD_ARGS];       // 0 terminated attr IDs
     AttrGetFunc  attrFuncs[MAX_ODD_ARGS];
-} * Odd;
+} *Odd;
 
 typedef struct _oddArgs {
     Odd   odd;
     VALUE args[MAX_ODD_ARGS];
-} * OddArgs;
+} *OddArgs;
 
 extern void    oj_odd_init(void);
 extern Odd     oj_get_odd(VALUE clas);

data/ext/oj/oj.c

@@ -11,10 +11,10 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "mem.h"
 #include "dump.h"
 #include "encode.h"
 #include "intern.h"
+#include "mem.h"
 #include "odd.h"
 #include "parse.h"
 #include "rails.h"
@@ -22,7 +22,7 @@
 typedef struct _yesNoOpt {
     VALUE sym;
     char *attr;
-} * YesNoOpt;
+} *YesNoOpt;
 
 void Init_oj();
 
@@ -156,8 +156,8 @@ static VALUE word_sym;
 static VALUE xmlschema_sym;
 static VALUE xss_safe_sym;
 
-rb_encoding *oj_utf8_encoding = 0;
-int oj_utf8_encoding_index = 0;
+rb_encoding *oj_utf8_encoding       = 0;
+int          oj_utf8_encoding_index = 0;
 
 #ifdef HAVE_PTHREAD_MUTEX_INIT
 pthread_mutex_t oj_cache_mutex;
@@ -465,7 +465,7 @@ static VALUE get_def_opts(VALUE self) {
     if (NULL == oj_default_options.ignore) {
         rb_hash_aset(opts, ignore_sym, Qnil);
     } else {
-        VALUE *        vp;
+        VALUE         *vp;
         volatile VALUE a = rb_ary_new();
 
         for (vp = oj_default_options.ignore; Qnil != *vp; vp++) {
@@ -640,15 +640,9 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts) {
     } else if (float_prec_sym == k) {
         int n;
 
-#ifdef RUBY_INTEGER_UNIFICATION
         if (rb_cInteger != rb_obj_class(v)) {
             rb_raise(rb_eArgError, ":float_precision must be a Integer.");
         }
-#else
-        if (T_FIXNUM != rb_type(v)) {
-            rb_raise(rb_eArgError, ":float_precision must be a Fixnum.");
-        }
-#endif
         n = FIX2INT(v);
         if (0 >= n) {
             *copts->float_fmt = '\0';
@@ -663,15 +657,9 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts) {
     } else if (cache_str_sym == k || cache_string_sym == k) {
         int n;
 
-#ifdef RUBY_INTEGER_UNIFICATION
         if (rb_cInteger != rb_obj_class(v)) {
             rb_raise(rb_eArgError, ":cache_str must be a Integer.");
         }
-#else
-        if (T_FIXNUM != rb_type(v)) {
-            rb_raise(rb_eArgError, ":cache_str must be a Fixnum.");
-        }
-#endif
         n = FIX2INT(v);
         if (0 >= n) {
             copts->cache_str = 0;
@@ -684,15 +672,9 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts) {
     } else if (sec_prec_sym == k) {
         int n;
 
-#ifdef RUBY_INTEGER_UNIFICATION
         if (rb_cInteger != rb_obj_class(v)) {
             rb_raise(rb_eArgError, ":second_precision must be a Integer.");
         }
-#else
-        if (T_FIXNUM != rb_type(v)) {
-            rb_raise(rb_eArgError, ":second_precision must be a Fixnum.");
-        }
-#endif
         n = NUM2INT(v);
         if (0 > n) {
             n                   = 0;
@@ -950,7 +932,7 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts) {
         if (Qnil == v) {
             return ST_CONTINUE;
         }
-	copts->sym_key = (Qtrue == v) ? Yes : No;
+        copts->sym_key = (Qtrue == v) ? Yes : No;
     }
     return ST_CONTINUE;
 }
@@ -1115,7 +1097,7 @@ static VALUE load(int argc, VALUE *argv, VALUE self) {
  * Returns [_Object_|_Hash_|_Array_|_String_|_Fixnum_|_Float_|_Boolean_|_nil_]
  */
 static VALUE load_file(int argc, VALUE *argv, VALUE self) {
-    char *            path;
+    char             *path;
     int               fd;
     Mode              mode = oj_default_options.mode;
     struct _parseInfo pi;
@@ -1123,7 +1105,7 @@ static VALUE load_file(int argc, VALUE *argv, VALUE self) {
     if (1 > argc) {
         rb_raise(rb_eArgError, "Wrong number of arguments to load().");
     }
-    Check_Type(*argv, T_STRING);
+    path = StringValuePtr(*argv);
     parse_info_init(&pi);
     pi.options   = oj_default_options;
     pi.handler   = Qnil;
@@ -1154,16 +1136,15 @@ static VALUE load_file(int argc, VALUE *argv, VALUE self) {
             }
         }
     }
-    path = StringValuePtr(*argv);
 #ifdef _WIN32
     {
         WCHAR *wide_path;
         wide_path = rb_w32_mbstr_to_wstr(CP_UTF8, path, -1, NULL);
-        fd = rb_w32_wopen(wide_path, O_RDONLY);
+        fd        = rb_w32_wopen(wide_path, O_RDONLY);
         OJ_FREE(wide_path);
     }
 #else
-    fd = open(path, O_RDONLY);
+    fd             = open(path, O_RDONLY);
 #endif
     if (0 == fd) {
         rb_raise(rb_eIOError, "%s", strerror(errno));
@@ -1238,10 +1219,10 @@ static VALUE safe_load(VALUE self, VALUE doc) {
  */
 
 struct dump_arg {
-    struct _out *    out;
+    struct _out     *out;
     struct _options *copts;
     int              argc;
-    VALUE *          argv;
+    VALUE           *argv;
 };
 
 static VALUE dump_body(VALUE a) {
@@ -1297,8 +1278,8 @@ static VALUE dump(int argc, VALUE *argv, VALUE self) {
 
     oj_out_init(arg.out);
 
-    arg.out->omit_nil  = copts.dump_opts.omit_nil;
-    arg.out->caller    = CALLER_DUMP;
+    arg.out->omit_nil = copts.dump_opts.omit_nil;
+    arg.out->caller   = CALLER_DUMP;
 
     return rb_ensure(dump_body, (VALUE)&arg, dump_ensure, (VALUE)&arg);
 }
@@ -1345,7 +1326,7 @@ static VALUE to_json(int argc, VALUE *argv, VALUE self) {
 
     oj_out_init(&out);
 
-    out.omit_nil  = copts.dump_opts.omit_nil;
+    out.omit_nil = copts.dump_opts.omit_nil;
     // For obj.to_json or generate nan is not allowed but if called from dump
     // it is.
     oj_dump_obj_to_json_using_params(*argv, &copts, &out, argc - 1, argv + 1);
@@ -1377,7 +1358,6 @@ static VALUE to_file(int argc, VALUE *argv, VALUE self) {
     if (3 == argc) {
         oj_parse_options(argv[2], &copts);
     }
-    Check_Type(*argv, T_STRING);
     oj_write_obj_to_file(argv[1], StringValuePtr(*argv), &copts);
 
     return Qnil;
@@ -1719,8 +1699,7 @@ static VALUE protect_require(VALUE x) {
 
 extern void print_all_odds(const char *label);
 
-static VALUE
-debug_odd(VALUE self, VALUE label) {
+static VALUE debug_odd(VALUE self, VALUE label) {
     print_all_odds(RSTRING_PTR(label));
     return Qnil;
 }
@@ -1780,7 +1759,7 @@ void Init_oj(void) {
     rb_protect(protect_require, Qnil, &err);
     rb_require("stringio");
     oj_utf8_encoding_index = rb_enc_find_index("UTF-8");
-    oj_utf8_encoding = rb_enc_from_index(oj_utf8_encoding_index);
+    oj_utf8_encoding       = rb_enc_from_index(oj_utf8_encoding_index);
 
     // rb_define_module_function(Oj, "hash_test", hash_test, 0);
     rb_define_module_function(Oj, "debug_odd", debug_odd, 1);
@@ -1819,49 +1798,49 @@ void Init_oj(void) {
 
     rb_define_module_function(Oj, "mem_report", mem_report, 0);
 
-    oj_add_value_id          = rb_intern("add_value");
-    oj_array_append_id       = rb_intern("array_append");
-    oj_array_end_id          = rb_intern("array_end");
-    oj_array_start_id        = rb_intern("array_start");
-    oj_as_json_id            = rb_intern("as_json");
-    oj_at_id                 = rb_intern("at");
-    oj_begin_id              = rb_intern("begin");
-    oj_bigdecimal_id         = rb_intern("BigDecimal");
-    oj_end_id                = rb_intern("end");
-    oj_error_id              = rb_intern("error");
-    oj_exclude_end_id        = rb_intern("exclude_end?");
-    oj_file_id               = rb_intern("file?");
-    oj_fileno_id             = rb_intern("fileno");
-    oj_ftype_id              = rb_intern("ftype");
-    oj_hash_end_id           = rb_intern("hash_end");
-    oj_hash_key_id           = rb_intern("hash_key");
-    oj_hash_set_id           = rb_intern("hash_set");
-    oj_hash_start_id         = rb_intern("hash_start");
-    oj_iconv_id              = rb_intern("iconv");
-    oj_json_create_id        = rb_intern("json_create");
-    oj_length_id             = rb_intern("length");
-    oj_new_id                = rb_intern("new");
-    oj_parse_id              = rb_intern("parse");
-    oj_pos_id                = rb_intern("pos");
-    oj_raw_json_id           = rb_intern("raw_json");
-    oj_read_id               = rb_intern("read");
-    oj_readpartial_id        = rb_intern("readpartial");
-    oj_replace_id            = rb_intern("replace");
-    oj_stat_id               = rb_intern("stat");
-    oj_string_id             = rb_intern("string");
-    oj_to_h_id               = rb_intern("to_h");
-    oj_to_hash_id            = rb_intern("to_hash");
-    oj_to_json_id            = rb_intern("to_json");
-    oj_to_s_id               = rb_intern("to_s");
-    oj_to_sym_id             = rb_intern("to_sym");
-    oj_to_time_id            = rb_intern("to_time");
-    oj_tv_nsec_id            = rb_intern("tv_nsec");
-    oj_tv_sec_id             = rb_intern("tv_sec");
-    oj_tv_usec_id            = rb_intern("tv_usec");
-    oj_utc_id                = rb_intern("utc");
-    oj_utc_offset_id         = rb_intern("utc_offset");
-    oj_utcq_id               = rb_intern("utc?");
-    oj_write_id              = rb_intern("write");
+    oj_add_value_id    = rb_intern("add_value");
+    oj_array_append_id = rb_intern("array_append");
+    oj_array_end_id    = rb_intern("array_end");
+    oj_array_start_id  = rb_intern("array_start");
+    oj_as_json_id      = rb_intern("as_json");
+    oj_at_id           = rb_intern("at");
+    oj_begin_id        = rb_intern("begin");
+    oj_bigdecimal_id   = rb_intern("BigDecimal");
+    oj_end_id          = rb_intern("end");
+    oj_error_id        = rb_intern("error");
+    oj_exclude_end_id  = rb_intern("exclude_end?");
+    oj_file_id         = rb_intern("file?");
+    oj_fileno_id       = rb_intern("fileno");
+    oj_ftype_id        = rb_intern("ftype");
+    oj_hash_end_id     = rb_intern("hash_end");
+    oj_hash_key_id     = rb_intern("hash_key");
+    oj_hash_set_id     = rb_intern("hash_set");
+    oj_hash_start_id   = rb_intern("hash_start");
+    oj_iconv_id        = rb_intern("iconv");
+    oj_json_create_id  = rb_intern("json_create");
+    oj_length_id       = rb_intern("length");
+    oj_new_id          = rb_intern("new");
+    oj_parse_id        = rb_intern("parse");
+    oj_pos_id          = rb_intern("pos");
+    oj_raw_json_id     = rb_intern("raw_json");
+    oj_read_id         = rb_intern("read");
+    oj_readpartial_id  = rb_intern("readpartial");
+    oj_replace_id      = rb_intern("replace");
+    oj_stat_id         = rb_intern("stat");
+    oj_string_id       = rb_intern("string");
+    oj_to_h_id         = rb_intern("to_h");
+    oj_to_hash_id      = rb_intern("to_hash");
+    oj_to_json_id      = rb_intern("to_json");
+    oj_to_s_id         = rb_intern("to_s");
+    oj_to_sym_id       = rb_intern("to_sym");
+    oj_to_time_id      = rb_intern("to_time");
+    oj_tv_nsec_id      = rb_intern("tv_nsec");
+    oj_tv_sec_id       = rb_intern("tv_sec");
+    oj_tv_usec_id      = rb_intern("tv_usec");
+    oj_utc_id          = rb_intern("utc");
+    oj_utc_offset_id   = rb_intern("utc_offset");
+    oj_utcq_id         = rb_intern("utc?");
+    oj_write_id        = rb_intern("write");
 
     rb_require("oj/bag");
     rb_require("oj/error");