ox 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2215329004101c80d8889571ae58a0ffa6c29606
-  data.tar.gz: 960ed868f559389e88f2be2fd9baf32f1ca6a3de
+  metadata.gz: d290437be6f76cdfe1bafdad90ec6a057e1e028a
+  data.tar.gz: 082a458a1848f01a68455b687ee155ab7eb81ddf
 SHA512:
-  metadata.gz: 90c53c12df67cd76cbecbb9649efef8762c69ba7665904722959349fe113784dd3af1e8c16bdbd32da97d70806f9383aa12d02b974d9c074899e221997240f4f
-  data.tar.gz: cf95951c262f221dd8e1d679cc288ac5837cf00adf074c906bf0c2842772af368d606e2f6b56a6375ef31936ef298c9b8ec662405c3c18a88024f09eeb76838c
+  metadata.gz: 4c6b1a63c3df6dd7c06ee00366dd871aea2153794d70b815f3d1582b032866d57310f22225a8f35e03529a3decb89f282b9b50bf5185865d11b3d1b72924cb55
+  data.tar.gz: 7e7a0ed99dfa2f85335a7e68d85346385852e89f55b3fcc0a47a059de8c2fb28345f5bbdc69889d13af9cfad1ef8d6058a512a035e9622ac94bb9f9b17862c39

data/README.md

@@ -34,6 +34,12 @@ A fast XML parser and Object marshaller as a Ruby gem.
 
 ## Release Notes
 
+### Release 2.4.3
+
+ - Fixed compiler warnings and errors.
+
+ - Updated for Ruby 2.4.0.
+
 ### Release 2.4.2
 
  - Added methods to Ox::Builder to provide output position information.

data/ext/ox/buf.h

@@ -45,7 +45,7 @@ typedef struct _Buf {
 
 inline static void
 buf_init(Buf buf, int fd, long initial_size) {
-    if (sizeof(buf->base) < initial_size) {
+    if (sizeof(buf->base) < (size_t)initial_size) {
 	buf->head = ALLOC_N(char, initial_size);
 	buf->end = buf->head + initial_size - 1;
     } else {

data/ext/ox/builder.c

@@ -67,7 +67,7 @@ append_indent(Builder b) {
     if (b->buf.head < b->buf.tail) {
 	int	cnt = (b->indent * (b->depth + 1)) + 1;
 
-	if (sizeof(indent_spaces) <= cnt) {
+	if (sizeof(indent_spaces) <=  (size_t)cnt) {
 	    cnt = sizeof(indent_spaces) - 1;
 	}
 	buf_append_string(&b->buf, indent_spaces, cnt);
@@ -87,7 +87,7 @@ append_string(Builder b, const char *str, size_t size) {
 	
 	buf_append_string(&b->buf, str, size);
 	b->col += size;
-	while (NULL != (s = index(s, '\n'))) {
+	while (NULL != (s = strchr(s, '\n'))) {
 	    b->line++;
 	    b->col = end - s;
 	}
@@ -326,13 +326,21 @@ builder_new(int argc, VALUE *argv, VALUE self) {
 
 	rb_check_type(*argv, T_HASH);
 	if (Qnil != (v = rb_hash_lookup(*argv, ox_indent_sym))) {
+#ifdef RUBY_INTEGER_UNIFICATION
+	    if (rb_cInteger != rb_obj_class(v)) {
+#else
 	    if (rb_cFixnum != rb_obj_class(v)) {
+#endif
 		rb_raise(ox_parse_error_class, ":indent must be a fixnum.\n");
 	    }
 	    indent = NUM2INT(v);
 	}
 	if (Qnil != (v = rb_hash_lookup(*argv, ox_size_sym))) {
+#ifdef RUBY_INTEGER_UNIFICATION
+	    if (rb_cInteger != rb_obj_class(v)) {
+#else
 	    if (rb_cFixnum != rb_obj_class(v)) {
+#endif
 		rb_raise(ox_parse_error_class, ":size must be a fixnum.\n");
 	    }
 	    buf_size = NUM2LONG(v);
@@ -382,13 +390,21 @@ builder_file(int argc, VALUE *argv, VALUE self) {
 
 	rb_check_type(argv[1], T_HASH);
 	if (Qnil != (v = rb_hash_lookup(argv[1], ox_indent_sym))) {
+#ifdef RUBY_INTEGER_UNIFICATION
+	    if (rb_cInteger != rb_obj_class(v)) {
+#else
 	    if (rb_cFixnum != rb_obj_class(v)) {
+#endif
 		rb_raise(ox_parse_error_class, ":indent must be a fixnum.\n");
 	    }
 	    indent = NUM2INT(v);
 	}
 	if (Qnil != (v = rb_hash_lookup(argv[1], ox_size_sym))) {
+#ifdef RUBY_INTEGER_UNIFICATION
+	    if (rb_cInteger != rb_obj_class(v)) {
+#else
 	    if (rb_cFixnum != rb_obj_class(v)) {
+#endif
 		rb_raise(ox_parse_error_class, ":size must be a fixnum.\n");
 	    }
 	    buf_size = NUM2LONG(v);
@@ -437,13 +453,21 @@ builder_io(int argc, VALUE *argv, VALUE self) {
 
 	rb_check_type(argv[1], T_HASH);
 	if (Qnil != (v = rb_hash_lookup(argv[1], ox_indent_sym))) {
+#ifdef RUBY_INTEGER_UNIFICATION
+	    if (rb_cInteger != rb_obj_class(v)) {
+#else
 	    if (rb_cFixnum != rb_obj_class(v)) {
+#endif
 		rb_raise(ox_parse_error_class, ":indent must be a fixnum.\n");
 	    }
 	    indent = NUM2INT(v);
 	}
 	if (Qnil != (v = rb_hash_lookup(argv[1], ox_size_sym))) {
+#ifdef RUBY_INTEGER_UNIFICATION
+	    if (rb_cInteger != rb_obj_class(v)) {
+#else
 	    if (rb_cFixnum != rb_obj_class(v)) {
+#endif
 		rb_raise(ox_parse_error_class, ":size must be a fixnum.\n");
 	    }
 	    buf_size = NUM2LONG(v);
@@ -570,7 +594,7 @@ builder_element(int argc, VALUE *argv, VALUE self) {
 	break;
     }
     e = &b->stack[b->depth];
-    if (sizeof(e->buf) <= len) {
+    if (sizeof(e->buf) <= (size_t)len) {
 	e->name = strdup(name);
 	*e->buf = '\0';
     } else {
@@ -689,7 +713,7 @@ builder_cdata(VALUE self, VALUE data) {
     b->pos += 9;
     buf_append_string(&b->buf, str, len);
     b->col += len;
-    while (NULL != (s = index(s, '\n'))) {
+    while (NULL != (s = strchr(s, '\n'))) {
 	b->line++;
 	b->col = end - s;
     }
@@ -726,7 +750,7 @@ builder_raw(VALUE self, VALUE text) {
     i_am_a_child(b, true);
     buf_append_string(&b->buf, str, len);
     b->col += len;
-    while (NULL != (s = index(s, '\n'))) {
+    while (NULL != (s = strchr(s, '\n'))) {
 	b->line++;
 	b->col = end - s;
     }

data/ext/ox/cache8.c

@@ -27,7 +27,7 @@ struct _Cache8 {
 };
 
 static void	cache8_delete(Cache8 cache, int depth);
-static void	slot_print(Cache8 cache, sid_t key, unsigned int depth);
+//static void	slot_print(Cache8 cache, sid_t key, unsigned int depth);
 
 void
 ox_cache8_new(Cache8 *cache) {
@@ -80,9 +80,10 @@ ox_cache8_get(Cache8 cache, sid_t key, slot_t **slot) {
     return **slot;
 }
 
+#if 0
 void
 ox_cache8_print(Cache8 cache) {
-    /*printf("-------------------------------------------\n"); */
+    //printf("-------------------------------------------\n");
     slot_print(cache, 0, 0);
 }
 
@@ -96,7 +97,7 @@ slot_print(Cache8 c, sid_t key, unsigned int depth) {
     for (i = 0, b = c->buckets; i < SLOT_CNT; i++, b++) {
 	if (0 != b->child) {
 	    k = (k8 << BITS) | i;
-	    /*printf("*** key: 0x%016llx  depth: %u  i: %u\n", k, depth, i); */
+	    //printf("*** key: 0x%016llx  depth: %u  i: %u\n", k, depth, i);
 	    if (DEPTH - 1 == depth) {
 		printf("0x%016llx: %4llu\n", (unsigned long long)k, (unsigned long long)b->value);
 	    } else {
@@ -105,3 +106,4 @@ slot_print(Cache8 c, sid_t key, unsigned int depth) {
 	}
     }
 }
+#endif

data/ext/ox/cache8.h

@@ -18,6 +18,6 @@ extern void	ox_cache8_delete(Cache8 cache);
 
 extern slot_t	ox_cache8_get(Cache8 cache, sid_t key, slot_t **slot);
 
-extern void	ox_cache8_print(Cache8 cache);
+//extern void	ox_cache8_print(Cache8 cache);
 
 #endif /* __OX_CACHE8_H__ */

data/ext/ox/ox.c

@@ -509,7 +509,7 @@ set_def_opts(VALUE self, VALUE opts) {
 
 	Check_Type(v, T_STRING);
 	slen = RSTRING_LEN(v);
-	if (sizeof(ox_default_options.inv_repl) - 2 < slen) {
+	if (sizeof(ox_default_options.inv_repl) - 2 <  (size_t)slen) {
 	    rb_raise(ox_parse_error_class, ":invalid_replace can be no longer than %ld characters.",
 		     sizeof(ox_default_options.inv_repl) - 2);
 	}
@@ -530,7 +530,7 @@ set_def_opts(VALUE self, VALUE opts) {
 
 	Check_Type(v, T_STRING);
 	slen = RSTRING_LEN(v);
-	if (sizeof(ox_default_options.strip_ns) - 1 < slen) {
+	if (sizeof(ox_default_options.strip_ns) - 1 <  (size_t)slen) {
 	    rb_raise(ox_parse_error_class, ":strip_namespace can be no longer than %ld characters.",
 		     sizeof(ox_default_options.strip_ns) - 1);
 	}
@@ -720,7 +720,7 @@ load(char *xml, int argc, VALUE *argv, VALUE self, VALUE encoding, Err err) {
 
 	    Check_Type(v, T_STRING);
 	    slen = RSTRING_LEN(v);
-	    if (sizeof(options.inv_repl) - 2 < slen) {
+	    if (sizeof(options.inv_repl) - 2 <  (size_t)slen) {
 		rb_raise(ox_parse_error_class, ":invalid_replace can be no longer than %ld characters.",
 			 sizeof(options.inv_repl) - 2);
 	    }
@@ -740,7 +740,7 @@ load(char *xml, int argc, VALUE *argv, VALUE self, VALUE encoding, Err err) {
 
 	    Check_Type(v, T_STRING);
 	    slen = RSTRING_LEN(v);
-	    if (sizeof(options.strip_ns) - 1 < slen) {
+	    if (sizeof(options.strip_ns) - 1 <  (size_t)slen) {
 		rb_raise(ox_parse_error_class, ":strip_namespace can be no longer than %ld characters.",
 			 sizeof(options.strip_ns) - 1);
 	    }
@@ -980,7 +980,7 @@ sax_parse(int argc, VALUE *argv, VALUE self) {
 
 		Check_Type(v, T_STRING);
 		slen = RSTRING_LEN(v);
-		if (sizeof(options.strip_ns) - 1 < slen) {
+		if (sizeof(options.strip_ns) - 1 <  (size_t)slen) {
 		    rb_raise(ox_parse_error_class, ":strip_namespace can be no longer than %ld characters.",
 			     sizeof(options.strip_ns) - 1);
 		}
@@ -1085,13 +1085,21 @@ parse_dump_options(VALUE ropts, Options copts) {
 	VALUE	v;
 	
 	if (Qnil != (v = rb_hash_lookup(ropts, ox_indent_sym))) {
+#ifdef RUBY_INTEGER_UNIFICATION
+	    if (rb_cInteger != rb_obj_class(v)) {
+#else
 	    if (rb_cFixnum != rb_obj_class(v)) {
+#endif
 		rb_raise(ox_parse_error_class, ":indent must be a Fixnum.\n");
 	    }
 	    copts->indent = NUM2INT(v);
 	}
 	if (Qnil != (v = rb_hash_lookup(ropts, trace_sym))) {
+#ifdef RUBY_INTEGER_UNIFICATION
+	    if (rb_cInteger != rb_obj_class(v)) {
+#else
 	    if (rb_cFixnum != rb_obj_class(v)) {
+#endif
 		rb_raise(ox_parse_error_class, ":trace must be a Fixnum.\n");
 	    }
 	    copts->trace = NUM2INT(v);
@@ -1123,7 +1131,7 @@ parse_dump_options(VALUE ropts, Options copts) {
 
 	    Check_Type(v, T_STRING);
 	    slen = RSTRING_LEN(v);
-	    if (sizeof(copts->inv_repl) - 2 < slen) {
+	    if (sizeof(copts->inv_repl) - 2 <  (size_t)slen) {
 		rb_raise(ox_parse_error_class, ":invalid_replace can be no longer than %ld characters.",
 			 sizeof(copts->inv_repl) - 2);
 	    }

data/lib/ox/version.rb

@@ -1,5 +1,5 @@
 
 module Ox
   # Current version of the module. 
-  VERSION = '2.4.2'
+  VERSION = '2.4.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-23 00:00:00.000000000 Z
+date: 2016-06-26 00:00:00.000000000 Z
 dependencies: []
 description: "A fast XML parser and object serializer that uses only standard C lib.\n
   \           \nOptimized XML (Ox), as the name implies was written to provide speed