left changes

Change-Id: Ia059475841baf25fbee6978c5201afb0fee6d8aa

Makefile

@@ -287,7 +287,6 @@ clean:ccpclean
 	rm -rf json2pb/json2pb_json_to_pb.o
 	rm -rf json2pb/json2pb_pb_to_json.o
 	rm -rf json2pb/json2pb_protobuf_map.o
-	rm -rf json2pb/json2pb_string_printf.o
 	rm -rf mcpack2pb/mcpack2pb_field_type.o
 	rm -rf mcpack2pb/mcpack2pb_mcpack2pb.o
 	rm -rf mcpack2pb/mcpack2pb_parser.o
@@ -900,14 +899,12 @@ libbthread.a:bthread/bthread_bthread.o \
 libjson2pb.a:json2pb/json2pb_encode_decode.o \
   json2pb/json2pb_json_to_pb.o \
   json2pb/json2pb_pb_to_json.o \
-  json2pb/json2pb_protobuf_map.o \
-  json2pb/json2pb_string_printf.o
+  json2pb/json2pb_protobuf_map.o
 	@echo "[COMAKE:BUILD][Target:'libjson2pb.a']"
 	ar crs libjson2pb.a json2pb/json2pb_encode_decode.o \
   json2pb/json2pb_json_to_pb.o \
   json2pb/json2pb_pb_to_json.o \
-  json2pb/json2pb_protobuf_map.o \
-  json2pb/json2pb_string_printf.o
+  json2pb/json2pb_protobuf_map.o
 	mkdir -p ./output/lib
 	cp -f libjson2pb.a ./output/lib
 
@@ -1954,10 +1951,6 @@ json2pb/json2pb_protobuf_map.o:json2pb/protobuf_map.cpp
 	@echo "[COMAKE:BUILD][Target:'json2pb/json2pb_protobuf_map.o']"
 	$(CXX) -c $(INCPATH) $(DEP_INCPATH) $(CPPFLAGS) $(CXXFLAGS)  -o json2pb/json2pb_protobuf_map.o json2pb/protobuf_map.cpp
 
-json2pb/json2pb_string_printf.o:json2pb/string_printf.cpp
-	@echo "[COMAKE:BUILD][Target:'json2pb/json2pb_string_printf.o']"
-	$(CXX) -c $(INCPATH) $(DEP_INCPATH) $(CPPFLAGS) $(CXXFLAGS)  -o json2pb/json2pb_string_printf.o json2pb/string_printf.cpp
-
 mcpack2pb/mcpack2pb_field_type.o:mcpack2pb/field_type.cpp
 	@echo "[COMAKE:BUILD][Target:'mcpack2pb/mcpack2pb_field_type.o']"
 	$(CXX) -c $(INCPATH) $(DEP_INCPATH) $(CPPFLAGS) $(CXXFLAGS)  -o mcpack2pb/mcpack2pb_field_type.o mcpack2pb/field_type.cpp

json2pb/json_to_pb.cpp

@@ -10,7 +10,7 @@
 #include "json_to_pb.h"
 #include "zero_copy_stream_reader.h"       // ZeroCopyStreamReader
 #include "encode_decode.h"
-#include "string_printf.h"
+#include "base/string_printf.h"
 #include "protobuf_map.h"
 #include "rapidjson.h"
 
@@ -19,7 +19,7 @@
         if (!perr->empty()) {                                           \
             perr->append(", ", 2);                                      \
         }                                                               \
-        ::json2pb::string_appendf(perr, fmt, ##__VA_ARGS__);      \
+        base::string_appendf(perr, fmt, ##__VA_ARGS__);                 \
     } else { }
 
 namespace json2pb {
@@ -37,15 +37,15 @@ static void string_append_value(const rapidjson::Value& value,
     } else if (value.IsBool()) {
         output->append(value.GetBool() ? "true" : "false");
     } else if (value.IsInt()) {
-        string_appendf(output, "%d", value.GetInt());
+        base::string_appendf(output, "%d", value.GetInt());
     } else if (value.IsUint()) {
-        string_appendf(output, "%u", value.GetUint());
+        base::string_appendf(output, "%u", value.GetUint());
     } else if (value.IsInt64()) {
-        string_appendf(output, "%ld", value.GetInt64());
+        base::string_appendf(output, "%ld", value.GetInt64());
     } else if (value.IsUint64()) {
-        string_appendf(output, "%lu", value.GetUint64());
+        base::string_appendf(output, "%lu", value.GetUint64());
     } else if (value.IsDouble()) {
-        string_appendf(output, "%f", value.GetDouble());
+        base::string_appendf(output, "%f", value.GetDouble());
     } else if (value.IsString()) {
         output->push_back('"');
         output->append(value.GetString(), value.GetStringLength());
@@ -72,7 +72,7 @@ inline bool value_invalid(const google::protobuf::FieldDescriptor* field, const
         }
         err->append("Invalid value `");
         string_append_value(value, err);
-        string_appendf(err, "' for %sfield `%s' which SHOULD be %s",
+        base::string_appendf(err, "' for %sfield `%s' which SHOULD be %s",
                        optional ? "optional " : "",
                        field->full_name().c_str(), type);
     }