natas_hw
/
OSM-binary
mirror of https://github.com/openstreetmap/OSM-binary
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid global variables

This commit is contained in:
Jochen Topf 2026-07-24 15:36:23 +02:00
parent 01f1a3f0be
commit c33d74be06
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tools/osmpbf-outline.cpp
View File

@ -28,24 +28,6 @@ namespace {
// should the output use color? // should the output use color?
bool usecolor = false; bool usecolor = false;
// buffer for reading a compressed blob from file
char buffer[OSMPBF::max_uncompressed_blob_size];
// buffer for decompressing the blob
char unpack_buffer[OSMPBF::max_uncompressed_blob_size];
// pbf struct of a BlobHeader
OSMPBF::BlobHeader blobheader;
// pbf struct of a Blob
OSMPBF::Blob blob;
// pbf struct of an OSM HeaderBlock
OSMPBF::HeaderBlock headerblock;
// pbf struct of an OSM PrimitiveBlock
OSMPBF::PrimitiveBlock primblock;
// prints a formatted message to stdout, optionally color coded // prints a formatted message to stdout, optionally color coded
void msg(const char* format, int color, va_list args) { void msg(const char* format, int color, va_list args) {
if (usecolor) { if (usecolor) {
@ -137,6 +119,12 @@ int main(int argc, char *argv[]) {
err("can't open file '%s'", argv[optind]); err("can't open file '%s'", argv[optind]);
} }
// buffer for reading a compressed blob from file
static char buffer[OSMPBF::max_uncompressed_blob_size];
// buffer for decompressing the blob
static char unpack_buffer[OSMPBF::max_uncompressed_blob_size];
// read while the file has not reached its end // read while the file has not reached its end
while (!std::feof(fp)) { while (!std::feof(fp)) {
// storage of size, used multiple times // storage of size, used multiple times
@ -160,6 +148,9 @@ int main(int argc, char *argv[]) {
err("unable to read blob-header from file"); err("unable to read blob-header from file");
} }
// pbf struct of a BlobHeader
OSMPBF::BlobHeader blobheader;
// parse the blob-header from the read-buffer // parse the blob-header from the read-buffer
if (!blobheader.ParseFromArray(buffer, static_cast<int>(sz))) { if (!blobheader.ParseFromArray(buffer, static_cast<int>(sz))) {
err("unable to parse blob header"); err("unable to parse blob header");
@ -188,6 +179,9 @@ int main(int argc, char *argv[]) {
err("unable to read blob from file"); err("unable to read blob from file");
} }
// pbf struct of a Blob
OSMPBF::Blob blob;
// parse the blob from the read-buffer // parse the blob from the read-buffer
if (!blob.ParseFromArray(buffer, static_cast<int>(sz))) { if (!blob.ParseFromArray(buffer, static_cast<int>(sz))) {
err("unable to parse blob"); err("unable to parse blob");
@ -331,6 +325,9 @@ int main(int argc, char *argv[]) {
// tell about the OSMHeader blob // tell about the OSMHeader blob
info(" OSMHeader"); info(" OSMHeader");
// pbf struct of an OSM HeaderBlock
OSMPBF::HeaderBlock headerblock;
// parse the HeaderBlock from the blob // parse the HeaderBlock from the blob
if (!headerblock.ParseFromArray(unpack_buffer, static_cast<int>(sz))) { if (!headerblock.ParseFromArray(unpack_buffer, static_cast<int>(sz))) {
err("unable to parse header block"); err("unable to parse header block");
@ -369,6 +366,9 @@ int main(int argc, char *argv[]) {
// tell about the OSMData blob // tell about the OSMData blob
info(" OSMData"); info(" OSMData");
// pbf struct of an OSM PrimitiveBlock
OSMPBF::PrimitiveBlock primblock;
// parse the PrimitiveBlock from the blob // parse the PrimitiveBlock from the blob
if (!primblock.ParseFromArray(unpack_buffer, static_cast<int>(sz))) { if (!primblock.ParseFromArray(unpack_buffer, static_cast<int>(sz))) {
err("unable to parse primitive block"); err("unable to parse primitive block");