From d23123643d98165c67ad51d1fdecf06486b1c6d9 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Thu, 16 Mar 2017 16:46:12 -0700
Subject: [PATCH] src: make PercentDecode return void

It only returns 0, nor is it likely to have any error conditions in the
future.

PR-URL: https://github.com/nodejs/node/pull/11922
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 src/node_url.cc |  3 +--
 src/node_url.h  | 11 +++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/node_url.cc b/src/node_url.cc
index 1aae5571158..6a9f8f3ca9e 100644
--- a/src/node_url.cc
+++ b/src/node_url.cc
@@ -368,8 +368,7 @@ namespace url {
     }
 
     // First, we have to percent decode
-    if (PercentDecode(input, length, &decoded) < 0)
-      goto end;
+    PercentDecode(input, length, &decoded);
 
     // Then we have to punycode toASCII
     if (!ToASCII(&decoded, &decoded))
diff --git a/src/node_url.h b/src/node_url.h
index 198c29938b7..ba05cd6fed6 100644
--- a/src/node_url.h
+++ b/src/node_url.h
@@ -376,11 +376,11 @@ static inline unsigned hex2bin(const char ch) {
   return static_cast<unsigned>(-1);
 }
 
-static inline int PercentDecode(const char* input,
-                                size_t len,
-                                std::string* dest) {
+static inline void PercentDecode(const char* input,
+                                 size_t len,
+                                 std::string* dest) {
   if (len == 0)
-    return 0;
+    return;
   dest->reserve(len);
   const char* pointer = input;
   const char* end = input + len;
@@ -399,11 +399,10 @@ static inline int PercentDecode(const char* input,
       unsigned a = hex2bin(pointer[1]);
       unsigned b = hex2bin(pointer[2]);
       char c = static_cast<char>(a * 16 + b);
-      *dest += static_cast<char>(c);
+      *dest += c;
       pointer += 3;
     }
   }
-  return 0;
 }
 
 #define SPECIALS(XX)                                                          \