From f914f37742a1d22c70cc650b720739b1f25d3cf3 Mon Sep 17 00:00:00 2001
From: Brian White <mscdex@mscdex.net>
Date: Mon, 6 Jun 2016 00:57:25 -0400
Subject: src: clean up string_search

This commit removes some unnecessary signed checks on unsigned
variables and removes a few unused private functions.

PR-URL: https://github.com/nodejs/node/pull/7174
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 src/string_search.h | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

(limited to 'src/string_search.h')

diff --git a/src/string_search.h b/src/string_search.h
index b60457da2a..7827fe153e 100644
--- a/src/string_search.h
+++ b/src/string_search.h
@@ -44,7 +44,7 @@ class Vector {
 
   // Access individual vector elements - checks bounds in debug mode.
   T& operator[](size_t index) const {
-    ASSERT(0 <= index && index < length_);
+    ASSERT(index < length_);
     return start_[is_forward_ ? index : (length_ - index - 1)];
   }
 
@@ -139,12 +139,6 @@ class StringSearch : private StringSearchBase {
       Vector<const Char>,
       size_t);
 
-  static size_t FailSearch(StringSearch<Char>*,
-                           Vector<const Char> subject,
-                           size_t) {
-    return subject.length();
-  }
-
   static size_t SingleCharSearch(StringSearch<Char>* search,
                                  Vector<const Char> subject,
                                  size_t start_index);
@@ -170,12 +164,6 @@ class StringSearch : private StringSearchBase {
 
   void PopulateBoyerMooreTable();
 
-  static inline bool exceedsOneByte(uint8_t c) { return false; }
-
-  static inline bool exceedsOneByte(uint16_t c) {
-    return c > kMaxOneByteCharCodeU;
-  }
-
   static inline int CharOccurrence(int* bad_char_occurrence,
                                    Char char_code) {
     if (sizeof(Char) == 1) {
@@ -401,7 +389,7 @@ size_t StringSearch<Char>::BoyerMooreSearch(
         return subject.length();
       }
     }
-    while (j >= 0 && pattern[j] == (c = subject[index + j])) {
+    while (pattern[j] == (c = subject[index + j])) {
       if (j == 0) {
         return index;
       }
@@ -529,7 +517,7 @@ size_t StringSearch<Char>::BoyerMooreHorspoolSearch(
       }
     }
     j--;
-    while (j >= 0 && pattern[j] == (subject[index + j])) {
+    while (pattern[j] == (subject[index + j])) {
       if (j == 0) {
         return index;
       }
-- 
cgit v1.2.3