diff --git a/geojson.c b/geojson.c index a65b41c4..4ca5009a 100644 --- a/geojson.c +++ b/geojson.c @@ -138,15 +138,6 @@ void serialize_uint(FILE *out, unsigned n, long long *fpos, const char *fname) { *fpos += sizeof(unsigned); } -void serialize_string(FILE *out, const char *s, long long *fpos, const char *fname) { - int len = strlen(s); - - serialize_int(out, len + 1, fpos, fname); - fwrite_check(s, sizeof(char), len, out, fname); - fwrite_check("", sizeof(char), 1, out, fname); - *fpos += len + 1; -} - void parse_geometry(int t, json_object *j, long long *bbox, long long *fpos, FILE *out, int op, const char *fname, int line, long long *wx, long long *wy, int *initialized, unsigned *initial_x, unsigned *initial_y) { if (j == NULL || j->type != JSON_ARRAY) { fprintf(stderr, "%s:%d: expected array for type %d\n", fname, line, t); @@ -274,17 +265,6 @@ void deserialize_byte(char **f, signed char *n) { *f += sizeof(signed char); } -struct pool_val *deserialize_string(char **f, struct pool *p, int type) { - struct pool_val *ret; - int len; - - deserialize_int(f, &len); - ret = pool(p, *f, type); - *f += len; - - return ret; -} - struct index { long long start; long long end; diff --git a/tile.cc b/tile.cc index 879f81b0..3f8a5160 100644 --- a/tile.cc +++ b/tile.cc @@ -137,7 +137,6 @@ struct coalesce { std::vector meta; unsigned long long index; unsigned long long index2; - char *metasrc; bool coalesced; long long original_seq; @@ -878,7 +877,6 @@ long long write_tile(char **geoms, char *metabase, char *stringpool, int z, unsi c.index = partials[i].index; c.index2 = partials[i].index2; c.geom = geoms[j]; - c.metasrc = meta; c.coalesced = false; c.original_seq = original_seq;