pbf_parser 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72b430f0eb6a15d794fb46e5a0abb20f57fc17d1
-  data.tar.gz: dcae3bf18500db3c8b6d4108e7b2e1e7e70681b4
+  metadata.gz: 0489b9514ead9c6a13ec957aeb4b9a1d48c75192
+  data.tar.gz: caaed36535aa45774e11a094c6a78ba958f90e5e
 SHA512:
-  metadata.gz: a3133b5fc953f64b3aca5d3bdc7d3acb4d06be5d7bfd42c20f73c173a4ba866f6deddfe114f9c2c27f5f50ea4d25e6b6081e21c00c0bb97137f2db8f11f8c70b
-  data.tar.gz: 68aca200b0b993d3c3d182e65d0c245af5da739076de5e6079086b2fe36c0f28db945bcc9288dd883009a7c4983094b6ee613c3bff1ec3704d6ae3db3135df3a
+  metadata.gz: d0b68e7154c00312ad96632f78467715e75a2c04154a9e450c37af2e1e5a1e3ec9e6af488c5c6550b7db7821933c5a6cfd05a74f2a5449b29a6094875ce66279
+  data.tar.gz: 46afa2839cf2ec0356c9100966c58a6817c992fda301b0900ef0436ddf47d2c8b5782a57de4847cfe16a030aef170ac384d53c4ab4b9898c50207acf1609214a

data/ext/pbf_parser/pbf_parser.c

@@ -176,7 +176,17 @@ static void add_info(VALUE hash, Info *info, StringTable *string_table, double t
   timestamp = info->timestamp ? LL2NUM(info->timestamp * ts_granularity) : Qnil;
   changeset = info->changeset ? LL2NUM(info->changeset) : Qnil;
   uid       = info->uid       ? INT2NUM(info->uid) : Qnil;
-  user      = info->user_sid  ? str_new(parse_binary_str(string_table->s[info->user_sid])) : Qnil;
+
+  if(info->user_sid)
+  {
+    char *user_sid = parse_binary_str(string_table->s[info->user_sid]);
+    user = str_new(user_sid);
+    free(user_sid);
+  }
+  else
+    user = Qnil;
+
+  free(user_sid);
 
   rb_hash_aset(hash, STR2SYM("version"), version);
   rb_hash_aset(hash, STR2SYM("timestamp"), timestamp);
@@ -205,6 +215,8 @@ static int parse_osm_header(VALUE obj, FILE *input)
   blob = read_blob(input, datasize, &blob_length);
   header_block = header_block__unpack(NULL, blob_length, blob);
 
+  free(blob);
+
   if(header_block == NULL)
     rb_raise(rb_eIOError, "Unable to unpack the HeaderBlock");
 
@@ -220,11 +232,13 @@ static int parse_osm_header(VALUE obj, FILE *input)
   VALUE osmosis_replication_sequence_number = Qnil;
   VALUE osmosis_replication_base_url        = Qnil;
 
+  int i = 0;
+
   if(header_block->n_required_features > 0)
   {
     required_features = rb_ary_new();
 
-    for(int i = 0; i < (int)header_block->n_required_features; i++)
+    for(i = 0; i < (int)header_block->n_required_features; i++)
       rb_ary_push(required_features, str_new(header_block->required_features[i]));
   }
 
@@ -232,7 +246,7 @@ static int parse_osm_header(VALUE obj, FILE *input)
   {
     optional_features = rb_ary_new();
 
-    for(int i = 0; i < (int)header_block->n_optional_features; i++)
+    for(i = 0; i < (int)header_block->n_optional_features; i++)
       rb_ary_push(optional_features, str_new(header_block->optional_features[i]));
   }
 
@@ -279,9 +293,10 @@ static void process_nodes(VALUE out, PrimitiveGroup *group, StringTable *string_
 {
   double lat = 0;
   double lon = 0;
-  unsigned j;
+  unsigned j = 0;
+  size_t i = 0;
 
-  for(size_t i = 0; i < group->n_nodes; i++)
+  for(i = 0; i < group->n_nodes; i++)
   {
     Node *node = group->nodes[i];
     VALUE node_out = rb_hash_new();
@@ -304,6 +319,9 @@ static void process_nodes(VALUE out, PrimitiveGroup *group, StringTable *string_
       char *value = parse_binary_str(string_table->s[node->vals[j]]);
 
       rb_hash_aset(tags, str_new(key), str_new(value));
+
+      free(key);
+      free(value);
     }
 
     rb_hash_aset(node_out, STR2SYM("tags"), tags);
@@ -325,8 +343,9 @@ static void process_dense_nodes(VALUE out, DenseNodes *dense_nodes, StringTable
   double lon = 0;
 
   unsigned j = 0;
+  size_t i = 0;
 
-  for(size_t i = 0; i < dense_nodes->n_id; i++)
+  for(i = 0; i < dense_nodes->n_id; i++)
   {
     VALUE node = rb_hash_new();
 
@@ -372,6 +391,9 @@ static void process_dense_nodes(VALUE out, DenseNodes *dense_nodes, StringTable
 
         rb_hash_aset(tags, str_new(key), str_new(value));
 
+        free(key);
+        free(value);
+
         j += 2;
       }
       j += 1;
@@ -385,8 +407,9 @@ static void process_dense_nodes(VALUE out, DenseNodes *dense_nodes, StringTable
 static void process_ways(VALUE out, PrimitiveGroup *group, StringTable *string_table, int32_t ts_granularity)
 {
   unsigned j, k;
+  size_t i = 0;
 
-  for(size_t i = 0; i < group->n_ways; i++)
+  for(i = 0; i < group->n_ways; i++)
   {
     Way *way = group->ways[i];
     int64_t delta_refs = 0;
@@ -404,6 +427,9 @@ static void process_ways(VALUE out, PrimitiveGroup *group, StringTable *string_t
       char *value = parse_binary_str(string_table->s[way->vals[j]]);
 
       rb_hash_aset(tags, str_new(key), str_new(value));
+
+      free(key);
+      free(value);
     }
 
     // Extract refs
@@ -428,8 +454,9 @@ static void process_ways(VALUE out, PrimitiveGroup *group, StringTable *string_t
 static void process_relations(VALUE out, PrimitiveGroup *group, StringTable *string_table, int32_t ts_granularity)
 {
   unsigned j, k;
+  size_t i = 0;
 
-  for(size_t i = 0; i < group->n_relations; i++)
+  for(i = 0; i < group->n_relations; i++)
   {
     Relation *relation = group->relations[i];
     VALUE relation_out = rb_hash_new();
@@ -445,6 +472,9 @@ static void process_relations(VALUE out, PrimitiveGroup *group, StringTable *str
       char *value = parse_binary_str(string_table->s[relation->vals[j]]);
 
       rb_hash_aset(tags, str_new(key), str_new(value));
+
+      free(key);
+      free(value);
     }
 
     // Extract members
@@ -464,8 +494,12 @@ static void process_relations(VALUE out, PrimitiveGroup *group, StringTable *str
 
       rb_hash_aset(member, STR2SYM("id"), LL2NUM(delta_memids));
 
-      if(role = parse_binary_str(string_table->s[relation->roles_sid[k]]))
+      if(relation->roles_sid[k])
+      {
+        role = parse_binary_str(string_table->s[relation->roles_sid[k]]);
         rb_hash_aset(member, STR2SYM("role"), str_new(role));
+        free(role);
+      }
 
       switch(relation->types[k])
       {
@@ -535,7 +569,9 @@ static VALUE parse_osm_data(VALUE obj)
   VALUE ways      = rb_hash_aref(data, STR2SYM("ways"));
   VALUE relations = rb_hash_aref(data, STR2SYM("relations"));
 
-  for(size_t i = 0; i < primitive_block->n_primitivegroup; i++)
+  size_t i = 0;
+
+  for(i = 0; i < primitive_block->n_primitivegroup; i++)
   {
     PrimitiveGroup *primitive_group = primitive_block->primitivegroup[i];
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pbf_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Adrià Planas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler