RLZ: remove hard-coded Win || Mac conditions.

rlz/lib/rlz_lib.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // A library to manage RLZ information for access-points shared
 // across different client applications.
 
 #include "rlz/lib/rlz_lib.h"
 
 #include "base/string_util.h"
@@ skipping 66 matching lines @@
     return true;
   }
 
   return false;
 }
 
 // This function will remove bad rlz chars and also limit the max rlz to some
 // reasonable size.  It also assumes that normalized_rlz is at least
 // kMaxRlzLength+1 long.
 void NormalizeRlz(const char* raw_rlz, char* normalized_rlz) {
-  int index = 0;
+  size_t index = 0;
   for (; raw_rlz[index] != 0 && index < rlz_lib::kMaxRlzLength; ++index) {
     char current = raw_rlz[index];
     if (IsGoodRlzChar(current)) {
       normalized_rlz[index] = current;
     } else {
       normalized_rlz[index] = '.';
     }
   }
 
   normalized_rlz[index] = 0;
@@ skipping 446 matching lines @@
         response_line.substr(3, separator_index - rlz_cgi_length);
       AccessPoint point = NO_ACCESS_POINT;
       if (!GetAccessPointFromName(point_name.c_str(), &point) ||
           point == NO_ACCESS_POINT)
         continue;  // Not a valid access point.
 
       // Get the new RLZ.
       std::string rlz_value(response_line.substr(separator_index + 2));
       TrimWhitespaceASCII(rlz_value, TRIM_LEADING, &rlz_value);
 
-      int rlz_length = rlz_value.find_first_of("\r\n ");
-      if (rlz_length < 0)
+      size_t rlz_length = rlz_value.find_first_of("\r\n ");
+      if (rlz_length == std::string::npos)
         rlz_length = rlz_value.size();
 
       if (rlz_length > kMaxRlzLength)
         continue;  // Too long.
 
       if (IsAccessPointSupported(point))
         SetAccessPointRlz(point, rlz_value.substr(0, rlz_length).c_str());
     } else if (StartsWithASCII(response_line, events_variable, true)) {
       // Clear events which server parsed.
       std::vector<ReturnedEvent> event_array;
@@ skipping 76 matching lines @@
   if (cgi_string.size() >= cgi_size)
     return false;
 
   strncpy(cgi, cgi_string.c_str(), cgi_size);
   cgi[cgi_size - 1] = 0;
 
   return true;
 }
 
 }  // namespace rlz_lib