← Back to branch summary

~kazer/navit/github

« back to all changes in this revision

Viewing changes to navit/maptool/osm_protobufdb.c

  • Committer: Pierre GRANDIN
  • Author(s): Bignaux Ronan
  • Date: 2018-10-20 06:15:27 UTC
  • Revision ID: git-v1:ce949480009e8ac4df6e81173c4e312958913605
Refactoring:navit/maptool:build with external protobuf-c (#650)

Show diffs side-by-side

added added

removed removed

Lines of Context:
navit/maptool/osm_protobufdb.c
26
26
#include "debug.h"
27
27
#include "linguistics.h"
28
28
#include "file.h"
29
 
#include "generated-code/fileformat.pb-c.h"
30
 
#include "generated-code/osmformat.pb-c.h"
 
29
#include "fileformat.pb-c.h"
 
30
#include "osmformat.pb-c.h"
31
31
 
32
32
static double latlon_scale=10000000.0;
33
33
 
125
125
    blob->raw.len=len;
126
126
    blob->raw_size=len;
127
127
    osm_protobufdb_write_blob(blob, ctx->f);
128
 
    osmpbf__blob__free_unpacked(blob, &protobuf_c_system_allocator);
129
 
    osmpbf__primitive_block__free_unpacked(ctx->pb, &protobuf_c_system_allocator);
 
128
    osmpbf__blob__free_unpacked(blob, NULL);
 
129
    osmpbf__primitive_block__free_unpacked(ctx->pb, NULL);
130
130
    ctx->pb=NULL;
131
131
    ctx->current_block++;
132
132
    return 1;
285
285
    *n=*node;
286
286
    if (!info) {
287
287
        if (old_info)
288
 
            osmpbf__info__free_unpacked(old_info, &protobuf_c_system_allocator);
 
288
            osmpbf__info__free_unpacked(old_info, NULL);
289
289
        n->info=NULL;
290
290
    } else {
291
291
        if (old_info)
325
325
    }
326
326
    if (!info) {
327
327
        if (old_info)
328
 
            osmpbf__info__free_unpacked(old_info, &protobuf_c_system_allocator);
 
328
            osmpbf__info__free_unpacked(old_info, NULL);
329
329
        w->info=NULL;
330
330
    } else {
331
331
        if (old_info)
368
368
    }
369
369
    if (!info) {
370
370
        if (old_info)
371
 
            osmpbf__info__free_unpacked(old_info, &protobuf_c_system_allocator);
 
371
            osmpbf__info__free_unpacked(old_info, NULL);
372
372
        r->info=NULL;
373
373
    } else {
374
374
        if (old_info)