From 1e187ce6220a724167bf477f03c775e42089a673 Mon Sep 17 00:00:00 2001
From: Philippe Liard <philip.liard@gmail.com>
Date: Wed, 25 Jul 2012 13:09:03 +0000
Subject: [PATCH] CPP: Fix geocoding data parser.

---
 .../phonenumbers/geocoding/geocoding_data_test.cc     |  4 ++--
 tools/cpp/src/cpp-build/generate_geocoding_data.cc    | 11 +++--------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/cpp/test/phonenumbers/geocoding/geocoding_data_test.cc b/cpp/test/phonenumbers/geocoding/geocoding_data_test.cc
index 37a531e06..bd641d430 100644
--- a/cpp/test/phonenumbers/geocoding/geocoding_data_test.cc
+++ b/cpp/test/phonenumbers/geocoding/geocoding_data_test.cc
@@ -157,8 +157,8 @@ TEST(GeocodingDataTest, TestTestGeocodingData) {
   ASSERT_EQ(2, desc_1_de->prefixes_size);
   const int32 expected_prefixes[] = {1201, 1650};
   const char* expected_descriptions[] = {
-    "New Jerse",
-    "Kalifornie",
+    "New Jersey",
+    "Kalifornien",
   };
   for (int i = 0; i < desc_1_de->prefixes_size; ++i) {
     EXPECT_EQ(expected_prefixes[i], desc_1_de->prefixes[i]);
diff --git a/tools/cpp/src/cpp-build/generate_geocoding_data.cc b/tools/cpp/src/cpp-build/generate_geocoding_data.cc
index d02a8530c..6bd3c8ba3 100644
--- a/tools/cpp/src/cpp-build/generate_geocoding_data.cc
+++ b/tools/cpp/src/cpp-build/generate_geocoding_data.cc
@@ -174,14 +174,9 @@ bool ParsePrefixes(const string& path, map<int32, string>* prefixes) {
       continue;
     }
     --end;
-    if (*end != '\n') {
-      if (!feof(input)) {
-        // A line without LF can only happen at the end of file.
-        return false;
-      }
-    } else {
-      // Consume the LF.
-      --end;
+    if (*end != '\n' && !feof(input)) {
+      // A line without LF can only happen at the end of file.
+      return false;
     }
 
     // Trim and check for comments.