From 9e9afb06d2d5463111738451845c9f113683b3fa Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@pobox.com>
Date: Fri, 22 Apr 2016 23:32:02 -0700
Subject: [PATCH] Fix signedness warnings, missing #includes, and code
 formatting.

---
 decode.cc    |  6 +++---
 mvt.cc       | 19 ++++++++++++-------
 tile-join.cc |  1 +
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/decode.cc b/decode.cc
index a3885f1..7b77cd3 100644
--- a/decode.cc
+++ b/decode.cc
@@ -61,7 +61,7 @@ void handle(std::string message, int z, unsigned x, unsigned y, int describe) {
 
 	printf(", \"features\": [\n");
 
-	for (int l = 0; l < tile.layers.size(); l++) {
+	for (size_t l = 0; l < tile.layers.size(); l++) {
 		mvt_layer &layer = tile.layers[l];
 		int extent = layer.extent;
 
@@ -79,7 +79,7 @@ void handle(std::string message, int z, unsigned x, unsigned y, int describe) {
 			within = 0;
 		}
 
-		for (int f = 0; f < layer.features.size(); f++) {
+		for (size_t f = 0; f < layer.features.size(); f++) {
 			mvt_feature &feat = layer.features[f];
 
 			if (within) {
@@ -146,7 +146,7 @@ void handle(std::string message, int z, unsigned x, unsigned y, int describe) {
 
 			std::vector<draw> ops;
 
-			for (int g = 0; g < feat.geometry.size(); g++) {
+			for (size_t g = 0; g < feat.geometry.size(); g++) {
 				int op = feat.geometry[g].op;
 				long long px = feat.geometry[g].x;
 				long long py = feat.geometry[g].y;
diff --git a/mvt.cc b/mvt.cc
index 4f895ff..fef9dde 100644
--- a/mvt.cc
+++ b/mvt.cc
@@ -154,7 +154,8 @@ bool mvt_decode(std::string &message, mvt_tile &out) {
 					}
 
 					layer.values.push_back(value);
-				} break;
+					break;
+				}
 
 				case 5: /* extent */
 					layer.extent = layer_reader.get_uint32();
@@ -174,7 +175,8 @@ bool mvt_decode(std::string &message, mvt_tile &out) {
 							for (auto it = pi.first; it != pi.second; ++it) {
 								feature.tags.push_back(*it);
 							}
-						} break;
+							break;
+						}
 
 						case 3: /* feature type */
 							feature.type = feature_reader.get_enum();
@@ -186,7 +188,8 @@ bool mvt_decode(std::string &message, mvt_tile &out) {
 							for (auto it = pi.first; it != pi.second; ++it) {
 								geoms.push_back(*it);
 							}
-						} break;
+							break;
+						}
 
 						default:
 							feature_reader.skip();
@@ -214,7 +217,8 @@ bool mvt_decode(std::string &message, mvt_tile &out) {
 					}
 
 					layer.features.push_back(feature);
-				} break;
+					break;
+				}
 
 				default:
 					layer_reader.skip();
@@ -223,7 +227,8 @@ bool mvt_decode(std::string &message, mvt_tile &out) {
 			}
 
 			out.layers.push_back(layer);
-		} break;
+			break;
+		}
 
 		default:
 			reader.skip();
@@ -243,8 +248,8 @@ std::string mvt_encode(mvt_tile &in) {
 		std::string layer_string;
 		protozero::pbf_writer layer_writer(layer_string);
 
-		layer_writer.add_uint32(15, 1); /* version */
-		layer_writer.add_string(1, in.layers[i].name); /* name */
+		layer_writer.add_uint32(15, 1);			 /* version */
+		layer_writer.add_string(1, in.layers[i].name);   /* name */
 		layer_writer.add_uint32(5, in.layers[i].extent); /* extent */
 
 		for (size_t j = 0; j < in.layers[i].keys.size(); j++) {
diff --git a/tile-join.cc b/tile-join.cc
index 69fabef..f0555b2 100644
--- a/tile-join.cc
+++ b/tile-join.cc
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <sqlite3.h>
 #include <limits.h>