oj 3.7.5 → 3.7.6

data/ext/oj/dump_leaf.c

@@ -227,7 +227,7 @@ oj_dump_leaf_to_json(Leaf leaf, Options copts, Out out) {
 void
 oj_write_leaf_to_file(Leaf leaf, const char *path, Options copts) {
     char	buf[4096];
-    struct _Out out;
+    struct _out out;
     size_t	size;
     FILE	*f;
 

data/ext/oj/dump_object.c

@@ -423,7 +423,7 @@ dump_odd(VALUE obj, Odd odd, VALUE clas, int depth, Out out) {
     if (odd->raw) {
 	v = rb_funcall(obj, *odd->attrs, 0);
 	if (Qundef == v || T_STRING != rb_type(v)) {
-	    rb_raise(rb_eEncodingError, "Invalid type for raw JSON.\n");
+	    rb_raise(rb_eEncodingError, "Invalid type for raw JSON.");
 	} else {	    
 	    const char	*s = rb_string_value_ptr((VALUE*)&v);
 	    int		len = (int)RSTRING_LEN(v);
@@ -462,7 +462,9 @@ dump_odd(VALUE obj, Odd odd, VALUE clas, int depth, Out out) {
 		ID	i;
 	    
 		if (sizeof(nbuf) <= nlen) {
-		    n2 = strdup(name);
+		    if (NULL == (n2 = strdup(name))) {
+			rb_raise(rb_eNoMemError, "for attribute name.");
+		    }
 		} else {
 		    strcpy(n2, name);
 		}

data/ext/oj/encode.h

@@ -28,8 +28,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __OJ_ENCODE_H__
-#define __OJ_ENCODE_H__
+#ifndef OJ_ENCODE_H
+#define OJ_ENCODE_H
 
 #include "ruby.h"
 #include "ruby/encoding.h"
@@ -40,4 +40,4 @@ oj_encode(VALUE rstr) {
     return rstr;
 }
 
-#endif /* __OJ_ENCODE_H__ */
+#endif /* OJ_ENCODE_H */

data/ext/oj/err.c

@@ -40,7 +40,7 @@ _oj_err_set_with_location(Err err, VALUE eclas, const char *msg, const char *jso
 
 void
 _oj_raise_error(const char *msg, const char *json, const char *current, const char* file, int line) {
-    struct _Err	err;
+    struct _err	err;
     int		n = 1;
     int		col = 1;
 

data/ext/oj/err.h

@@ -28,8 +28,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __OJ_ERR_H__
-#define __OJ_ERR_H__
+#ifndef OJ_ERR_H
+#define OJ_ERR_H
 
 #include "ruby.h"
 // Needed to silence 2.4.0 warnings.
@@ -37,9 +37,9 @@
 # define NORETURN(x) x
 #endif
 
-#define set_error(err, eclas, msg, json, current) _oj_err_set_with_location(err, eclas, msg, json, current, __FILE__, __LINE__)
+#define set_error(err, eclas, msg, json, current) _oj_err_set_with_location(err, eclas, msg, json, current, FILE, LINE)
 
-typedef struct _Err {
+typedef struct _err {
     VALUE	clas;
     char	msg[128];
 } *Err;
@@ -67,4 +67,4 @@ err_has(Err e) {
     return (Qnil != e->clas);
 }
 
-#endif /* __OJ_ERR_H__ */
+#endif /* OJ_ERR_H */

data/ext/oj/fast.c

@@ -43,16 +43,16 @@
 // maximum to allocate on the stack, arbitrary limit
 #define SMALL_XML	65536
 #define MAX_STACK	100
-//#define BATCH_SIZE	(4096 / sizeof(struct _Leaf) - 1)
+//#define BATCH_SIZE	(4096 / sizeof(struct _leaf) - 1)
 #define BATCH_SIZE	100
 
-typedef struct _Batch {
-    struct _Batch	*next;
+typedef struct _batch {
+    struct _batch	*next;
     int			next_avail;
-    struct _Leaf	leaves[BATCH_SIZE];
+    struct _leaf	leaves[BATCH_SIZE];
 } *Batch;
 
-typedef struct _Doc {
+typedef struct _doc {
     Leaf		data;
     Leaf		*where;	     // points to current location
     Leaf		where_path[MAX_STACK]; // points to head of path
@@ -60,10 +60,10 @@ typedef struct _Doc {
     unsigned long	size;	     // number of leaves/branches in the doc
     VALUE		self;
     Batch		batches;
-    struct _Batch	batch0;
+    struct _batch	batch0;
 } *Doc;
 
-typedef struct _ParseInfo {
+typedef struct _parseInfo {
     char	*str;		/* buffer being read from */
     char	*s;		/* current position in buffer */
     Doc		doc;
@@ -204,10 +204,10 @@ leaf_new(Doc doc, int type) {
     Leaf	leaf;
 
     if (0 == doc->batches || BATCH_SIZE == doc->batches->next_avail) {
-	Batch	b = ALLOC(struct _Batch);
+	Batch	b = ALLOC(struct _batch);
 
 	// Initializes all leaves with a NO_VAL value_type
-	memset(b, 0, sizeof(struct _Batch));
+	memset(b, 0, sizeof(struct _batch));
 	b->next = doc->batches;
 	doc->batches = b;
 	b->next_avail = 0;
@@ -734,7 +734,7 @@ read_quoted_value(ParseInfo pi) {
 // doc support functions
 inline static void
 doc_init(Doc doc) {
-    memset(doc, 0, sizeof(struct _Doc));
+    memset(doc, 0, sizeof(struct _doc));
     doc->where = doc->where_path;
     doc->self = Qundef;
     doc->batches = &doc->batch0;
@@ -813,16 +813,16 @@ mark_doc(void *ptr) {
 
 static VALUE
 parse_json(VALUE clas, char *json, bool given, bool allocated) {
-    struct _ParseInfo	pi;
+    struct _parseInfo	pi;
     volatile VALUE	result = Qnil;
     Doc			doc;
     int			ex = 0;
     volatile VALUE	self;
 
     if (given) {
-	doc = ALLOCA_N(struct _Doc, 1);
+	doc = ALLOCA_N(struct _doc, 1);
     } else {
-	doc = ALLOC(struct _Doc);
+	doc = ALLOC(struct _doc);
     }
     /* skip UTF-8 BOM if present */
     if (0xEF == (uint8_t)*json && 0xBB == (uint8_t)json[1] && 0xBF == (uint8_t)json[2]) {
@@ -1624,7 +1624,7 @@ doc_dump(int argc, VALUE *argv, VALUE self) {
 
 	if (0 == filename) {
 	    char	buf[4096];
-	    struct _Out out;
+	    struct _out out;
 
 	    out.buf = buf;
 	    out.end = buf + sizeof(buf) - 10;

data/ext/oj/hash.c

@@ -34,19 +34,19 @@
 #define HASH_MASK	0x000003FF
 #define  HASH_SLOT_CNT	1024
 
-typedef struct _KeyVal {
-    struct _KeyVal	*next;
+typedef struct _keyVal {
+    struct _keyVal	*next;
     const char		*key;
     size_t		len;
     VALUE		val;
 } *KeyVal;
 
-struct _Hash {
-    struct _KeyVal	slots[HASH_SLOT_CNT];
+struct _hash {
+    struct _keyVal	slots[HASH_SLOT_CNT];
 };
 
-struct _Hash	class_hash;
-struct _Hash	intern_hash;
+struct _hash	class_hash;
+struct _hash	intern_hash;
 
 // almost the Murmur hash algorithm
 #define M 0x5bd1e995
@@ -114,7 +114,7 @@ hash_get(Hash hash, const char *key, size_t len, VALUE **slotp, VALUE def_value)
     }
     if (0 != slotp) {
 	if (0 != bucket->key) {
-	    KeyVal	b = ALLOC(struct _KeyVal);
+	    KeyVal	b = ALLOC(struct _keyVal);
 	
 	    b->next = 0;
 	    bucket->next = b;

data/ext/oj/hash.h

@@ -28,12 +28,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __OJ_HASH_H__
-#define __OJ_HASH_H__
+#ifndef OJ_HASH_H
+#define OJ_HASH_H
 
 #include "ruby.h"
 
-typedef struct _Hash	*Hash;
+typedef struct _hash	*Hash;
 
 extern void	oj_hash_init();
 
@@ -43,4 +43,4 @@ extern ID	oj_attr_hash_get(const char *key, size_t len, ID **slotp);
 extern void	oj_hash_print();
 extern char*	oj_strndup(const char *s, size_t len);
 
-#endif /* __OJ_HASH_H__ */
+#endif /* OJ_HASH_H */

data/ext/oj/hash_test.c

@@ -39,12 +39,12 @@
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>
 
-typedef struct _StrLen {
+typedef struct _strLen {
     const char	*str;
     size_t	len;
 } *StrLen;
 
-static struct _StrLen data[] = {
+static struct _strLen data[] = {
     { "Gem::Version", 12 },
     { "TracePoint", 10 },
     { "Complex::compatible", 19 },

data/ext/oj/mimic_json.c

@@ -196,8 +196,8 @@ mimic_limit_arg(VALUE a) {
 static VALUE
 mimic_dump(int argc, VALUE *argv, VALUE self) {
     char		buf[4096];
-    struct _Out		out;
-    struct _Options	copts = oj_default_options;
+    struct _out		out;
+    struct _options	copts = oj_default_options;
     VALUE		rstr;
 
     copts.str_rx.head = NULL;
@@ -354,7 +354,7 @@ mimic_dump_load(int argc, VALUE *argv, VALUE self) {
 static VALUE
 mimic_generate_core(int argc, VALUE *argv, Options copts) {
     char	buf[4096];
-    struct _Out	out;
+    struct _out	out;
     VALUE	rstr;
 
     out.buf = buf;
@@ -414,7 +414,7 @@ mimic_generate_core(int argc, VALUE *argv, Options copts) {
  */
 VALUE
 oj_mimic_generate(int argc, VALUE *argv, VALUE self) {
-    struct _Options	copts = oj_default_options;
+    struct _options	copts = oj_default_options;
 
     copts.str_rx.head = NULL;
     copts.str_rx.tail = NULL;
@@ -432,7 +432,7 @@ oj_mimic_generate(int argc, VALUE *argv, VALUE self) {
  */
 VALUE
 oj_mimic_pretty_generate(int argc, VALUE *argv, VALUE self) {
-    struct _Options	copts = oj_default_options;
+    struct _options	copts = oj_default_options;
     VALUE		rargs[2];
     volatile VALUE	h;
 
@@ -481,7 +481,7 @@ oj_mimic_pretty_generate(int argc, VALUE *argv, VALUE self) {
 
 static VALUE
 mimic_parse_core(int argc, VALUE *argv, VALUE self, bool bang) {
-    struct _ParseInfo	pi;
+    struct _parseInfo	pi;
     VALUE		ropts;
     VALUE		args[1];
 
@@ -660,7 +660,7 @@ mimic_create_id(VALUE self) {
     return rb_str_new_cstr(oj_json_class);
 }
 
-static struct _Options	mimic_object_to_json_options = {
+static struct _options	mimic_object_to_json_options = {
     0,		// indent
     No,		// circular
     No,		// auto_define
@@ -717,9 +717,9 @@ static struct _Options	mimic_object_to_json_options = {
 static VALUE
 mimic_object_to_json(int argc, VALUE *argv, VALUE self) {
     char		buf[4096];
-    struct _Out		out;
+    struct _out		out;
     VALUE		rstr;
-    struct _Options	copts = oj_default_options;
+    struct _options	copts = oj_default_options;
 
     copts.str_rx.head = NULL;
     copts.str_rx.tail = NULL;

data/ext/oj/object.c

@@ -677,7 +677,7 @@ start_hash(ParseInfo pi) {
 }
 
 static void
-end_hash(struct _ParseInfo *pi) {
+end_hash(ParseInfo pi) {
     Val	parent = stack_peek(&pi->stack);
 
     if (Qnil == parent->val) {
@@ -765,7 +765,7 @@ oj_set_object_callbacks(ParseInfo pi) {
 
 VALUE
 oj_object_parse(int argc, VALUE *argv, VALUE self) {
-    struct _ParseInfo	pi;
+    struct _parseInfo	pi;
 
     parse_info_init(&pi);
     pi.options = oj_default_options;
@@ -782,7 +782,7 @@ oj_object_parse(int argc, VALUE *argv, VALUE self) {
 
 VALUE
 oj_object_parse_cstr(int argc, VALUE *argv, char *json, size_t len) {
-    struct _ParseInfo	pi;
+    struct _parseInfo	pi;
 
     parse_info_init(&pi);
     pi.options = oj_default_options;

data/ext/oj/odd.c

@@ -7,8 +7,8 @@
 
 #include "odd.h"
 
-static struct _Odd	_odds[4]; // bump up if new initial Odd classes are added
-static struct _Odd	*odds = _odds;
+static struct _odd	_odds[4]; // bump up if new initial Odd classes are added
+static struct _odd	*odds = _odds;
 static long		odd_cnt = 0;
 static ID		sec_id;
 static ID		sec_fraction_id;
@@ -152,7 +152,7 @@ oj_get_oddc(const char *classname, size_t len) {
 
 OddArgs
 oj_odd_alloc_args(Odd odd) {
-    OddArgs	oa = ALLOC_N(struct _OddArgs, 1);
+    OddArgs	oa = ALLOC_N(struct _oddArgs, 1);
     VALUE	*a;
     int		i;
 
@@ -191,15 +191,17 @@ oj_reg_odd(VALUE clas, VALUE create_object, VALUE create_method, int mcnt, VALUE
     AttrGetFunc	*fp;
 
     if (_odds == odds) {
-	odds = ALLOC_N(struct _Odd, odd_cnt + 1);
+	odds = ALLOC_N(struct _odd, odd_cnt + 1);
 
-	memcpy(odds, _odds, sizeof(struct _Odd) * odd_cnt);
+	memcpy(odds, _odds, sizeof(struct _odd) * odd_cnt);
     } else {
-	REALLOC_N(odds, struct _Odd, odd_cnt + 1);
+	REALLOC_N(odds, struct _odd, odd_cnt + 1);
     }
     odd = odds + odd_cnt;
     odd->clas = clas;
-    odd->classname = strdup(rb_class2name(clas));
+    if (NULL == (odd->classname = strdup(rb_class2name(clas)))) {
+	rb_raise(rb_eNoMemError, "for attribute name.");
+    }
     odd->clen = strlen(odd->classname);
     odd->create_obj = create_object;
     odd->create_op = SYM2ID(create_method);
@@ -210,7 +212,9 @@ oj_reg_odd(VALUE clas, VALUE create_object, VALUE create_method, int mcnt, VALUE
 	*fp = 0;
 	switch (rb_type(*members)) {
 	case T_STRING:
-	    *np = strdup(rb_string_value_ptr(members));
+	    if (NULL == (*np = strdup(rb_string_value_ptr(members)))) {
+		rb_raise(rb_eNoMemError, "for attribute name.");
+	    }
 	    break;
 	case T_SYMBOL:
 	    *np = rb_id2name(SYM2ID(*members));

data/ext/oj/odd.h

@@ -3,8 +3,8 @@
  * All rights reserved.
  */
 
-#ifndef __OJ_ODD_H__
-#define __OJ_ODD_H__
+#ifndef OJ_ODD_H
+#define OJ_ODD_H
 
 #include <stdbool.h>
 
@@ -14,7 +14,7 @@
 
 typedef VALUE	(*AttrGetFunc)(VALUE obj);
 
-typedef struct _Odd {
+typedef struct _odd {
     const char	*classname;
     size_t	clen;
     VALUE	clas;			// Ruby class or module
@@ -28,7 +28,7 @@ typedef struct _Odd {
     AttrGetFunc	attrFuncs[MAX_ODD_ARGS];
 } *Odd;
 
-typedef struct _OddArgs {
+typedef struct _oddArgs {
     Odd		odd;
     VALUE	args[MAX_ODD_ARGS];
 } *OddArgs;
@@ -41,4 +41,4 @@ extern void	oj_odd_free(OddArgs args);
 extern int	oj_odd_set_arg(OddArgs args, const char *key, size_t klen, VALUE value);
 extern void	oj_reg_odd(VALUE clas, VALUE create_object, VALUE create_method, int mcnt, VALUE *members, bool raw);
 
-#endif /* __OJ_ODD_H__ */
+#endif /* OJ_ODD_H */

data/ext/oj/oj.c

@@ -19,7 +19,7 @@
 #include "rails.h"
 #include "encode.h"
 
-typedef struct _YesNoOpt {
+typedef struct _yesNoOpt {
     VALUE	sym;
     char	*attr;
 } *YesNoOpt;
@@ -154,7 +154,7 @@ VALUE oj_cache_mutex = Qnil;
 
 const char	oj_json_class[] = "json_class";
 
-struct _Options	oj_default_options = {
+struct _options	oj_default_options = {
     0,		// indent
     No,		// circular
     No,		// auto_define
@@ -401,7 +401,7 @@ set_def_opts(VALUE self, VALUE opts) {
 
 void
 oj_parse_options(VALUE ropts, Options copts) {
-    struct _YesNoOpt	ynos[] = {
+    struct _yesNoOpt	ynos[] = {
 	{ circular_sym, &copts->circular },
 	{ auto_define_sym, &copts->auto_define },
 	{ symbol_keys_sym, &copts->sym_key },
@@ -901,7 +901,7 @@ load_file(int argc, VALUE *argv, VALUE self) {
     char		*path;
     int			fd;
     Mode		mode = oj_default_options.mode;
-    struct _ParseInfo	pi;
+    struct _parseInfo	pi;
 
     if (1 > argc) {
 	rb_raise(rb_eArgError, "Wrong number of arguments to load().");
@@ -976,7 +976,7 @@ load_file(int argc, VALUE *argv, VALUE self) {
  */
 static VALUE
 safe_load(VALUE self, VALUE doc) {
-    struct _ParseInfo	pi;
+    struct _parseInfo	pi;
     VALUE		args[1];
 
     parse_info_init(&pi);
@@ -1028,8 +1028,8 @@ safe_load(VALUE self, VALUE doc) {
 static VALUE
 dump(int argc, VALUE *argv, VALUE self) {
     char		buf[4096];
-    struct _Out		out;
-    struct _Options	copts = oj_default_options;
+    struct _out		out;
+    struct _options	copts = oj_default_options;
     VALUE		rstr;
 
     if (1 > argc) {
@@ -1080,8 +1080,8 @@ dump(int argc, VALUE *argv, VALUE self) {
 static VALUE
 to_json(int argc, VALUE *argv, VALUE self) {
     char		buf[4096];
-    struct _Out		out;
-    struct _Options	copts = oj_default_options;
+    struct _out		out;
+    struct _options	copts = oj_default_options;
     VALUE		rstr;
 
     if (1 > argc) {
@@ -1125,7 +1125,7 @@ to_json(int argc, VALUE *argv, VALUE self) {
  */
 static VALUE
 to_file(int argc, VALUE *argv, VALUE self) {
-    struct _Options	copts = oj_default_options;
+    struct _options	copts = oj_default_options;
     
     if (3 == argc) {
 	oj_parse_options(argv[2], &copts);
@@ -1148,7 +1148,7 @@ to_file(int argc, VALUE *argv, VALUE self) {
  */
 static VALUE
 to_stream(int argc, VALUE *argv, VALUE self) {
-    struct _Options	copts = oj_default_options;
+    struct _options	copts = oj_default_options;
     
     if (3 == argc) {
 	oj_parse_options(argv[2], &copts);
@@ -1699,7 +1699,9 @@ Init_oj() {
     oj_mimic_rails_init();
 
 #if HAVE_LIBPTHREAD
-    pthread_mutex_init(&oj_cache_mutex, 0);
+    if (0 != (err = pthread_mutex_init(&oj_cache_mutex, 0))) {
+	rb_raise(rb_eException, "failed to initialize a mutex. %s", strerror(err));
+    }
 #else
     oj_cache_mutex = rb_mutex_new();
     rb_gc_register_address(&oj_cache_mutex);