id_shuffler 0.0.5 → 0.0.6

data/ext/id_shuffler/id_shuffler.c

@@ -32,9 +32,8 @@
  */
 
 const int i = 1;
-#define is_bigendian() ( (*(char*)&i) == 0 )
 
-const char ftable[256] = { 
+const unsigned char ftable[256] = { 
 0xa3,0xd7,0x09,0x83,0xf8,0x48,0xf6,0xf4,0xb3,0x21,0x15,0x78,0x99,0xb1,0xaf,0xf9,
 0xe7,0x2d,0x4d,0x8a,0xce,0x4c,0xca,0x2e,0x52,0x95,0xd9,0x1e,0x4e,0x38,0x44,0x28,
 0x0a,0xdf,0x02,0xa0,0x17,0xf1,0x60,0x68,0x12,0xb7,0x7a,0xc3,0xe9,0xfa,0x3d,0x53,
@@ -53,7 +52,7 @@ const char ftable[256] = {
 0x5e,0x6c,0xa9,0x13,0x57,0x25,0xb5,0xe3,0xbd,0xa8,0x3a,0x01,0x05,0x59,0x2a,0x46
 };
 
-uint32_t g(char key[10], int k, uint32_t w)
+uint32_t g(unsigned char key[10], int k, uint32_t w)
 {
     uint8_t g1, g2, g3, g4, g5, g6;
 
@@ -73,16 +72,16 @@ static VALUE r_is_big_endian(VALUE self) {
 }
 
 static VALUE r_g1(VALUE self) {
-  char key[10] = {1,2,3,4,5,6,7,8,9,10};
+  unsigned char key[10] = {1,2,3,4,5,6,7,8,9,10};
   return ULONG2NUM(g(key,1,1));
 }
 
 static VALUE r_g2(VALUE self) {
-  char key[10] = {1,2,3,4,5,6,7,8,9,10};
+  unsigned char key[10] = {1,2,3,4,5,6,7,8,9,10};
   return ULONG2NUM(g(key,1,32767));
 }
 
-uint32_t skip30(char key[10], uint32_t num, int encrypt)
+uint32_t skip30(unsigned char key[10], uint32_t num, int encrypt)
 {
     int         k; /* round number */
     int         i; /* round counter */
@@ -111,17 +110,17 @@ uint32_t skip30(char key[10], uint32_t num, int encrypt)
 }
 
 static VALUE r_skip1(VALUE self) {
-  char key[10] = {1,2,3,4,5,6,7,8,9,10};
+  unsigned char key[10] = {1,2,3,4,5,6,7,8,9,10};
   return ULONG2NUM(skip30(key,1,1));
 }
 
 static VALUE r_skip2(VALUE self) {
-  char key[10] = {1,2,3,4,5,6,7,8,9,10};
+  unsigned char key[10] = {1,2,3,4,5,6,7,8,9,10};
   return ULONG2NUM(skip30(key,32767,1));
 }
 
 static VALUE r_skip3(VALUE self, VALUE original_num) {
-  char key[10] = {1,2,3,4,5,6,7,8,9,10};
+  unsigned char key[10] = {1,2,3,4,5,6,7,8,9,10};
   unsigned long original_ulong;
   original_ulong = NUM2ULONG(original_num);
   uint32_t original = original_ulong;
@@ -129,7 +128,7 @@ static VALUE r_skip3(VALUE self, VALUE original_num) {
 }
 
 static VALUE r_skip4(VALUE self, VALUE original_num, VALUE key_str) {
-  char *key = StringValuePtr(key_str);
+  unsigned char *key = StringValuePtr(key_str);
   unsigned long original_ulong;
   original_ulong = NUM2ULONG(original_num);
   uint32_t original = original_ulong;
@@ -155,7 +154,7 @@ static VALUE r_base32_shuffle(VALUE self, VALUE original_num, VALUE key_str) {
   /* convert from ruby objects */
   unsigned long original_ulong;
   original_ulong = NUM2ULONG(original_num);
-  char *key = StringValuePtr(key_str);
+  unsigned char *key = StringValuePtr(key_str);
 
   /* bounds check the id */
   if (original_ulong >= (1 << 30)) {
@@ -173,8 +172,8 @@ static VALUE r_base32_shuffle(VALUE self, VALUE original_num, VALUE key_str) {
   uint32_t shuffled = skip30(key, original, 1);
 
   /* base-32 encode the result using "crockford 32" alphabet */
-  char buf[6];
-  char *digits = "0123456789abcdefghjkmnpqrstvwxyz";
+  unsigned char buf[6];
+  unsigned char *digits = "0123456789abcdefghjkmnpqrstvwxyz";
   int cpos;
   for (cpos = 0; cpos < 6; cpos ++) {
     buf[cpos] = digits[((shuffled >> (5*(5-cpos))) & 31)];
@@ -185,8 +184,8 @@ static VALUE r_base32_shuffle(VALUE self, VALUE original_num, VALUE key_str) {
 }
 
 static VALUE r_b32(VALUE self, VALUE original_num) {
-  char buf[6];
-  char *digits = "0123456789abcdefghjkmnpqrstvwxyz";
+  unsigned char buf[6];
+  unsigned char *digits = "0123456789abcdefghjkmnpqrstvwxyz";
   int cpos;
   unsigned long original_ulong;
   original_ulong = NUM2ULONG(original_num);
@@ -207,20 +206,20 @@ static VALUE r_base32_unshuffle(VALUE self, VALUE shuffled_str, VALUE key_str) {
    * -> "a" etc.  */
 
   /* convert from ruby string to char buf */
-  char *b32 = StringValuePtr(shuffled_str);
+  unsigned char *b32 = StringValuePtr(shuffled_str);
   if (RSTRING_LEN(shuffled_str) != 6) {
     /* must be 6 base-32 digits */
     return INT2NUM(-1);
   }
-  char *key = StringValuePtr(key_str);
+  unsigned char *key = StringValuePtr(key_str);
   if (RSTRING_LEN(key_str) < 10) {
     return rb_str_new2("invalid key length");
   }
 
   /* remove base32 encoding */
   uint32_t shuffled = 0;
-  char *found;
-  char *digits = "0123456789abcdefghjkmnpqrstvwxyz";
+  unsigned char *found;
+  unsigned char *digits = "0123456789abcdefghjkmnpqrstvwxyz";
   int cpos = 0;
   for (cpos = 0; cpos < 6; cpos++) {
     found = strchr(digits,b32[cpos]);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: id_shuffler
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors: