src: make PercentDecode return void

TimothyGu · TimothyGu · commit d23123643d98 · 2017-03-21T17:45:54.000-07:00
It only returns 0, nor is it likely to have any error conditions in the future. PR-URL: nodejs#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>
diff --git 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
@@ -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)                                                          \

Original file line number	Diff line number	Diff line change
`@@ -368,8 +368,7 @@ namespace url {`
`368`	`368`	`}`
`369`	`369`
`370`	`370`	`// First, we have to percent decode`
`371`		`- if (PercentDecode(input, length, &decoded) < 0)`
`372`		`- goto end;`
	`371`	`+ PercentDecode(input, length, &decoded);`
`373`	`372`
`374`	`373`	`// Then we have to punycode toASCII`
`375`	`374`	`if (!ToASCII(&decoded, &decoded))`