ox 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6501b4bbce82df3807ef682abd7900ad0a01c8c4
-  data.tar.gz: ab7dc1b9321f2f023edba54e29104a3962136b5e
+  metadata.gz: 46e015e0b3899db57415e3edbf2634590d199b7e
+  data.tar.gz: 5aeb573b6fdc7342b392513e4731713f4c7caee2
 SHA512:
-  metadata.gz: c0192af23950c8fbcbc3ff351a12b17e57198836e34fe1b8662f4089b93389ac6e2b614deb8c1c96f61c5d99d76aa06509e0a049e97011ea708fc09440df3968
-  data.tar.gz: b95bb36a7fbc7695dcb333f13e610d9086e977a538c22e85c1941fb33d076c9b371380a208d4ed5f078556a73bae4c36cd895e2615b254bb987aa4b3837b7483
+  metadata.gz: 1258f0904dd33ebc85adf0f89436dd1d4d783cfd2393f1cdc4fe0cfc55321c33da5fb687dd4cdda0df15922c850a27fa3cdd1a5491b4e4d713598d4de64f36db
+  data.tar.gz: 3b34e3bbfbb4b6d512f763447a822ce6552f3630e5097b03b8a33ae3ea563452cb9cc2718135b40496640b654b65c180214274594e8605924f434275373e5e98

data/README.md

@@ -34,6 +34,11 @@ A fast XML parser and Object marshaller as a Ruby gem.
 
 ## Release Notes
 
+### Release 2.2.4
+
+ - Changed the code to allow compilation on older compilers. No change in
+   functionality otherwise.
+
 ### Release 2.2.3
 
  - The convert_special option now applies to attributes as well as elements in

data/ext/ox/sax_buf.c

@@ -37,16 +37,16 @@ ox_sax_buf_init(Buf buf, VALUE io) {
 	VALUE	s = rb_funcall2(io, ox_string_id, 0, 0);
 
 	buf->read_func = read_from_str;
-	buf->in_str = StringValuePtr(s);
+	buf->in.str = StringValuePtr(s);
     } else if (rb_cFile == io_class && Qnil != (rfd = rb_funcall(io, ox_fileno_id, 0))) {
 	buf->read_func = read_from_fd;
-	buf->fd = FIX2INT(rfd);
+	buf->in.fd = FIX2INT(rfd);
     } else if (rb_respond_to(io, ox_readpartial_id)) {
 	buf->read_func = read_from_io_partial;
-	buf->io = io;
+	buf->in.io = io;
     } else if (rb_respond_to(io, ox_read_id)) {
 	buf->read_func = read_from_io;
-	buf->io = io;
+	buf->in.io = io;
     } else {
         rb_raise(ox_arg_error_class, "sax_parser io argument must respond to readpartial() or read().\n");
     }
@@ -137,7 +137,7 @@ partial_io_cb(VALUE rbuf) {
     size_t	cnt;
 
     args[0] = ULONG2NUM(buf->end - buf->tail);
-    rstr = rb_funcall2(buf->io, ox_readpartial_id, 1, args);
+    rstr = rb_funcall2(buf->in.io, ox_readpartial_id, 1, args);
     str = StringValuePtr(rstr);
     cnt = strlen(str);
     //printf("*** read partial %lu bytes, str: '%s'\n", cnt, str);
@@ -156,7 +156,7 @@ io_cb(VALUE rbuf) {
     size_t	cnt;
 
     args[0] = ULONG2NUM(buf->end - buf->tail);
-    rstr = rb_funcall2(buf->io, ox_read_id, 1, args);
+    rstr = rb_funcall2(buf->in.io, ox_read_id, 1, args);
     str = StringValuePtr(rstr);
     cnt = strlen(str);
     //printf("*** read %lu bytes, str: '%s'\n", cnt, str);
@@ -181,7 +181,7 @@ read_from_fd(Buf buf) {
     ssize_t     cnt;
     size_t      max = buf->end - buf->tail;
 
-    cnt = read(buf->fd, buf->tail, max);
+    cnt = read(buf->in.fd, buf->tail, max);
     if (cnt < 0) {
         ox_sax_drive_error(buf->dr, "failed to read from file");
         return -1;
@@ -210,14 +210,14 @@ read_from_str(Buf buf) {
     char	*s;
     long	cnt;
 
-    if ('\0' == *buf->in_str) {
+    if ('\0' == *buf->in.str) {
 	/* done */
 	return -1;
     }
-    s = ox_stpncpy(buf->tail, buf->in_str, max);
+    s = ox_stpncpy(buf->tail, buf->in.str, max);
     *s = '\0';
     cnt = s - buf->tail;
-    buf->in_str += cnt;
+    buf->in.str += cnt;
     buf->read_end = buf->tail + cnt;
 
     return 0;

data/ext/ox/sax_buf.h

@@ -24,8 +24,8 @@ typedef struct _Buf {
     union {
         int     	fd;
         VALUE   	io;
-	const char	*in_str;
-    };
+	const char	*str;
+    } in;
     struct _SaxDrive	*dr;
 } *Buf;
 

data/lib/ox/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-31 00:00:00.000000000 Z
+date: 2016-02-04 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