mmdb 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28afec18a26cb57a2d9274d5aca15b99e71036ab
-  data.tar.gz: 8a1111e0382d6a033288143fcce6a66d6db6a208
+  metadata.gz: ddbd3f739b7ffac9b3e61811c4aa3edf5e8a55f7
+  data.tar.gz: bd71b111bd50ac7c88fad053377120c027f4a2c8
 SHA512:
-  metadata.gz: a101f8fc21977db024fd74503f05030a91076a38375212c0315c7f2f0ddbee712d0be7684be84e900f71a7e3805ae2e313d4972116fc59798fce414a8c1108ea
-  data.tar.gz: eeecbe7c806621a46815525190897ed2c8c4777b286d6feb0560f89d93b01c1d661bb08408d5786a1d8721f9c072401d8f169fb9b9bb9312b9abe6f43dc84964
+  metadata.gz: e6fe7e623f94fec0f4e45e0a7078cf7e3329b57826d46fddae0c1d939412f6a023e96affa116e93bb585b3e302032ca331ab3bff73161637630bb706cd230558
+  data.tar.gz: 1fac584cfb105ae76f5379414d87b7fd1cc3fd29f016e5132261b46e4cba9d58a3c265a66d83d1f384c6e35161fca175d3512edf42379d34c2c341da5f611aa7

data/ext/mmdb/mmdb.c

@@ -17,20 +17,20 @@ static VALUE rb_sym_longitude;
 static VALUE rb_sym_postcode;
 static VALUE rb_sym_subdivisions;
 
-const static char *en = "en";
-const static char *names = "names";
-const static char *city = "city";
-const static char *country = "country";
-const static char *country_code = "country_code";
-const static char *continent = "continent";
-const static char *location = "location";
-const static char *latitude = "latitude";
-const static char *longitude = "longitude";
-const static char *postal = "postal";
-const static char *code = "code";
-const static char *iso_code = "iso_code";
-const static char *postcode = "postcode";
-const static char *subdivisions = "subdivisions";
+static const char *en = "en";
+static const char *names = "names";
+static const char *city = "city";
+static const char *country = "country";
+static const char *country_code = "country_code";
+static const char *continent = "continent";
+static const char *location = "location";
+static const char *latitude = "latitude";
+static const char *longitude = "longitude";
+static const char *postal = "postal";
+static const char *code = "code";
+static const char *iso_code = "iso_code";
+static const char *postcode = "postcode";
+static const char *subdivisions = "subdivisions";
 
 struct MaxMindDB {
     MMDB_s *mmdb;
@@ -145,13 +145,15 @@ maxminddb_lookup(VALUE self, VALUE ip) {
     VALUE ret;
     int gai_error, mmdb_error;
     struct MaxMindDB *ptr = MaxMindDB(self);
-    MMDB_s *mmdb = ptr->mmdb;
+    MMDB_lookup_result_s lookuped;
+    MMDB_entry_data_s data;
+    MMDB_entry_s *entry;
 
     if (NIL_P(ip)) {
         return Qnil;
     }
 
-    MMDB_lookup_result_s lookuped = MMDB_lookup_string(mmdb, StringValuePtr(ip), &gai_error, &mmdb_error);
+    lookuped = MMDB_lookup_string(ptr->mmdb, StringValuePtr(ip), &gai_error, &mmdb_error);
     if (gai_error) {
         rb_sys_fail(gai_strerror(gai_error));
     }
@@ -161,8 +163,7 @@ maxminddb_lookup(VALUE self, VALUE ip) {
 
     if (lookuped.found_entry) {
         ret = rb_hash_new();
-        MMDB_entry_data_s data;
-        MMDB_entry_s *entry = &lookuped.entry;
+        entry = &lookuped.entry;
 
         MMDB_get_value(entry, &data, city, names, en, NULL);
         maxminddb_set_result(ret, rb_sym_city, &data);
@@ -190,13 +191,14 @@ maxminddb_lookup(VALUE self, VALUE ip) {
             // subdivisions fields is basically array
             if (data.type == MMDB_DATA_TYPE_ARRAY) {
                 VALUE ary = rb_ary_new();
+                int i;
                 int n, data_size;
                 int count = 0;
                 n = data_size = data.data_size;
                 number_of_digits(n, count);
                 char index[count+1];
 
-                for (int i = 0; i < data_size; i++) {
+                for (i = 0; i < data_size; i++) {
                     sprintf(index, "%d", i);
                     MMDB_get_value(entry, &data, subdivisions, index, names, en, NULL);
                     if (data.has_data) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mmdb
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - yoppi