sereal 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be6217bfe2c81f0f7d3629fa097268a8f2c6733d
-  data.tar.gz: 9fe57e2249069b77131d74a804690bb1c7c552b3
+  metadata.gz: e9c00595b7b2a08fc9b2357c3b052ff8a189f2e4
+  data.tar.gz: baac3f20a92210853ee70a77472343509a025fb5
 SHA512:
-  metadata.gz: cc6658e1080248464d912bfc794c7d0d42a1e825ff25f5ef513b39a9b1e00861278fec81089c2d0a940afd446f827ada673c906b5e4c1628d6b2d5c3d96efe68
-  data.tar.gz: 220da226733dcb0ef43a96f5505d0de35165468685a3cbf592a8df523cc035b2ce106117cd3f3026451019fff249587551d579ba12d97f0868af04504ac25ca7
+  metadata.gz: f9c467d56b2ee8386059b5799da6d40f3aa4dffdb81025ebdc02325593478f34b4ae08ea41a6498a0fb61f680645ef1c8b3e2f2f292158b1a818bb3434c25c72
+  data.tar.gz: 85e7ed8c617e392617fa6adbf78bc04e7e758eb20e964a6e452eeff81045eb3dff2601b73a0c61548ea91e0fbae3df7ef8ad0bd87d0abcb383739880f32cf5e3

data/ext/sereal/decode.c

@@ -47,7 +47,7 @@ static VALUE s_read_double(sereal_t *s, u8 tag) {
 
 /* LONG DOUBLE */
 static VALUE s_read_long_double(sereal_t *s, u8 tag) {
-    return DBL2NUM((double) s_get_long_double(s));
+    return DBL2NUM((double) s_get_long_double_bang(s));
 }
 
 /* POS */
@@ -105,13 +105,13 @@ static VALUE s_read_rb_string_bang(sereal_t *s,u8 t) {
     u32 len = 0;
     VALUE string;
 // len - 1: we also use the current byte, similar to u32,float.. casts
-#define RETURN_STRING(fx_l,fx_gen)                             \
-    do {                                                       \
-        len = fx_l;                                            \
-        u8 *ptr = len == 0 ? 0 : s_get_p_req_inclusive(s,len); \
-        string = fx_gen;                                       \
-        s_shift_position_bang(s,len);                          \
-        return string;                                         \
+#define RETURN_STRING(fx_l,fx_gen)              \
+    do {                                        \
+        len       = fx_l;                       \
+        char *ptr = (char *) (len == 0 ? 0 : s_get_p_req_inclusive(s,len)); \
+        string    = fx_gen;                     \
+        s_shift_position_bang(s,len);           \
+        return string;                          \
     } while(0);
 
     if (t == SRL_HDR_STR_UTF8) {
@@ -180,7 +180,7 @@ static VALUE s_read_ref(sereal_t *s, u8 tag) {
         s_raise(s,rb_eArgError,"there are no references stored");
     u64 off = s_get_varint_bang(s);
     VALUE object = rb_hash_lookup(s->tracked,INT2FIX(off + s->hdr_end));
-    SD(s,"reading reference from offset: %d, id: %d",off + s->hdr_end,FIX2INT(rb_obj_id(object)));
+    SD(s,"reading reference from offset: %llu, id: %d",off + s->hdr_end,FIX2INT(rb_obj_id(object)));
     return object;
 }
 
@@ -338,15 +338,15 @@ again:
             return Qnil;
         }
         if (size < __MIN_SIZE)
-            s_raise(s,rb_eTypeError,"size(%d) is less then min packet size %d, offset: %d",size,__MIN_SIZE,offset);
+            s_raise(s,rb_eTypeError,"size(%d) is less then min packet size %d, offset: %llu",size,__MIN_SIZE,offset);
 
         s->flags |= __NOT_MINE;
-        s->data = RSTRING_PTR(payload) + offset;
+        s->data = (u8 *) RSTRING_PTR(payload) + offset;
         s->size = size;
     }
 
     u32 magic = s_get_u32_bang(s);
-    if (magic != SRL_MAGIC_STRING_LILIPUTIAN)
+    if (magic != SRL_MAGIC_STRING_UINT_LE)
         s_raise(s,rb_eTypeError,"invalid header: %d (%x)",magic,magic);
 
     u8 version = s_get_u8_bang(s);
@@ -388,7 +388,7 @@ again:
         u8 *uncompressed = s_alloc_or_raise(s,uncompressed_len);
         int done = csnappy_decompress(s_get_p_req_inclusive(s,compressed_len),
                                       compressed_len,
-                                      uncompressed,
+                                      (char *) uncompressed,
                                       uncompressed_len) == CSNAPPY_E_OK ? 1 : 0;
         if (!done)
             s_raise(s,rb_eTypeError, "decompression failed error: %d type: %d, unompressed size: %d compressed size: %d",

data/ext/sereal/encode.c

@@ -116,7 +116,7 @@ static inline void s_append_string(sereal_t *s,u8 *string, u32 len,u8 is_utf8) {
 }
 
 static void s_append_rb_string(sereal_t *s, VALUE object) {
-    s_append_string(s,RSTRING_PTR(object),
+    s_append_string(s,(u8 *)RSTRING_PTR(object),
                     RSTRING_LEN(object),
                     (is_ascii_string(object) ? FALSE : TRUE));
 }
@@ -377,7 +377,7 @@ method_sereal_encode(VALUE self, VALUE args) {
     }
 
     // setup header
-    s_append_u32(s,SRL_MAGIC_STRING_LILIPUTIAN);
+    s_append_u32(s,SRL_MAGIC_STRING_UINT_LE);
     s_append_u8(s,version);
     s_append_u8(s,0x0);
     u32 s_header_len = s->pos;
@@ -421,9 +421,9 @@ method_sereal_encode(VALUE self, VALUE args) {
 
         u8 *start = s_get_p_at_pos(s,s_header_len,0);
         u8 *working_buf = s_alloc_or_raise(s,CSNAPPY_WORKMEM_BYTES);
-        csnappy_compress(start,
+        csnappy_compress((char *)start,
                          s_body_len,
-                         (compressed + s_header_len + compressed_len_varint + un_compressed_len_varint),
+                         (char *)(compressed + s_header_len + compressed_len_varint + un_compressed_len_varint),
                          &compressed_len,
                          working_buf,
                          CSNAPPY_WORKMEM_BYTES_POWER_OF_TWO);
@@ -441,7 +441,7 @@ method_sereal_encode(VALUE self, VALUE args) {
         s->pos = s->size;
     }
 
-    VALUE result = rb_str_new(s->data,s->size);
+    VALUE result = rb_str_new((char *) s->data,s->size);
     s_destroy(s);
     return result;
 }

data/ext/sereal/proto.h

@@ -1,5 +1,5 @@
 #define SRL_MAGIC_STRING                "=srl"          /* Magic string for header. Every packet starts with this */
-#define SRL_MAGIC_STRING_LILIPUTIAN     0x6c72733d      /* SRL_MAGIC_STRING as a little endian integer */
+#define SRL_MAGIC_STRING_UINT_LE     0x6c72733d      /* SRL_MAGIC_STRING as a little endian integer */
 
 #define SRL_PROTOCOL_VERSION            ( 2 )           /* this is the first. for some reason we did not use 0 */
 #define SRL_PROTOCOL_VERSION_BITS       ( 4 )           /* how many bits we use for the version, the rest go to the encoding */

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sereal
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Borislav Nikolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Sereal encoder/decoder