Remove dead code

This commit is contained in:
Eric Fischer
2016-03-02 14:58:07 -08:00
parent 0fcd2d9a79
commit a847db8c5f
2 changed files with 0 additions and 22 deletions
-20
View File
@@ -138,15 +138,6 @@ void serialize_uint(FILE *out, unsigned n, long long *fpos, const char *fname) {
*fpos += sizeof(unsigned); *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) { 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) { if (j == NULL || j->type != JSON_ARRAY) {
fprintf(stderr, "%s:%d: expected array for type %d\n", fname, line, t); 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); *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 { struct index {
long long start; long long start;
long long end; long long end;
-2
View File
@@ -137,7 +137,6 @@ struct coalesce {
std::vector<int> meta; std::vector<int> meta;
unsigned long long index; unsigned long long index;
unsigned long long index2; unsigned long long index2;
char *metasrc;
bool coalesced; bool coalesced;
long long original_seq; 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.index = partials[i].index;
c.index2 = partials[i].index2; c.index2 = partials[i].index2;
c.geom = geoms[j]; c.geom = geoms[j];
c.metasrc = meta;
c.coalesced = false; c.coalesced = false;
c.original_seq = original_seq; c.original_seq = original_seq;