diegoripley/tippecanoe
1
0
Fork 0
mirror of https://github.com/felt/tippecanoe.git synced 2026-10-05 18:05:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Close files that were being left open

Browse Source
This commit is contained in:
Eric Fischer
2015-12-22 15:42:51 -08:00
parent fde3aa45de
commit 02cf4d46ad
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
geojson.c
+17 -7
View File
@@ -1154,7 +1154,12 @@ int read_json(int argc, char **argv, char *fname, const char *layername, int max
perror("Reunify index"); perror("Reunify index");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
munmap(map, reader[i].indexpos); if (munmap(map, reader[i].indexpos) != 0) {
perror("unmap unmerged index");
}
if (close(reader[i].indexfd) != 0) {
perror("close unmerged index");
}
indexpos += reader[i].indexpos; indexpos += reader[i].indexpos;
} }
} }
@@ -1454,10 +1459,6 @@ int read_json(int argc, char **argv, char *fname, const char *layername, int max
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} }
if (close(reader[i].geomfd) != 0) {
perror("close unsorted geometry");
}
} }
char geomname[strlen(tmpdir) + strlen("/geom.XXXXXXXX") + 1]; char geomname[strlen(tmpdir) + strlen("/geom.XXXXXXXX") + 1];
@@ -1516,6 +1517,9 @@ int read_json(int argc, char **argv, char *fname, const char *layername, int max
if (munmap(reader[i].geom_map, reader[i].geomst.st_size) != 0) { if (munmap(reader[i].geom_map, reader[i].geomst.st_size) != 0) {
perror("unmap unsorted geometry"); perror("unmap unsorted geometry");
} }
if (close(reader[i].geomfd) != 0) {
perror("close unsorted geometry");
}
} }
if (close(indexfd) != 0) { if (close(indexfd) != 0) {
perror("close sorted index"); perror("close sorted index");
@@ -1607,12 +1611,16 @@ int read_json(int argc, char **argv, char *fname, const char *layername, int max
perror("Reunify meta"); perror("Reunify meta");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
munmap(map, reader[i].metapos); if (munmap(map, reader[i].metapos) != 0) {
perror("unmap unmerged meta");
}
} }
meta_off[i] = metapos; meta_off[i] = metapos;
metapos += reader[i].metapos; metapos += reader[i].metapos;
close(reader[i].metafd); if (close(reader[i].metafd) != 0) {
perror("close unmerged meta");
}
if (reader[i].poolfile->off > 0) { if (reader[i].poolfile->off > 0) {
if (fwrite(reader[i].poolfile->map, reader[i].poolfile->off, 1, poolfile) != 1) { if (fwrite(reader[i].poolfile->map, reader[i].poolfile->off, 1, poolfile) != 1) {
@@ -1660,9 +1668,11 @@ int read_json(int argc, char **argv, char *fname, const char *layername, int max
perror("close meta"); perror("close meta");
} }
if (poolpos > 0) {
if (munmap(stringpool, poolpos) != 0) { if (munmap(stringpool, poolpos) != 0) {
perror("munmap stringpool"); perror("munmap stringpool");
} }
}
if (close(poolfd) < 0) { if (close(poolfd) < 0) {
perror("close pool"); perror("close pool");
} }