Commit c7713f1
src: remove base64_select_table and base64_table
node::base64_encode() uses ::base64_encode() when the mode is
Base64Mode::NORMAL, so base64_select_table is only ever called for
Base64Mode::URL and thus only ever returns base64_table_url, but never
base64_table.
Also move base64_table_url into base64-inl.h.
PR-URL: #44425
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Minwoo Jung <nodecorelab@gmail.com>1 parent a3dc7e1 commit c7713f1
2 files changed
Lines changed: 5 additions & 17 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -9,6 +9,10 @@ | |||
| 9 | 9 | ||
| 10 | 10 | namespace node { | |
| 11 | 11 | ||
| 12 | + static constexpr char base64_table_url[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" | ||
| 13 | + "abcdefghijklmnopqrstuvwxyz" | ||
| 14 | + "0123456789-_"; | ||
| 15 | + | ||
| 12 | 16 | extern const int8_t unbase64_table[256]; | |
| 13 | 17 | ||
| 14 | 18 | ||
@@ -144,7 +148,7 @@ inline size_t base64_encode(const char* src, | |||
| 144 | 148 | unsigned k; | |
| 145 | 149 | unsigned n; | |
| 146 | 150 | ||
| 147 | - const char* table = base64_select_table(mode); | ||
| 151 | + const char* table = base64_table_url; | ||
| 148 | 152 | ||
| 149 | 153 | i = 0; | |
| 150 | 154 | k = 0; | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -17,22 +17,6 @@ enum class Base64Mode { | |||
| 17 | 17 | URL | |
| 18 | 18 | }; | |
| 19 | 19 | ||
| 20 | - static constexpr char base64_table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" | ||
| 21 | - "abcdefghijklmnopqrstuvwxyz" | ||
| 22 | - "0123456789+/"; | ||
| 23 | - | ||
| 24 | - static constexpr char base64_table_url[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" | ||
| 25 | - "abcdefghijklmnopqrstuvwxyz" | ||
| 26 | - "0123456789-_"; | ||
| 27 | - | ||
| 28 | - static inline const char* base64_select_table(Base64Mode mode) { | ||
| 29 | - switch (mode) { | ||
| 30 | - case Base64Mode::NORMAL: return base64_table; | ||
| 31 | - case Base64Mode::URL: return base64_table_url; | ||
| 32 | - default: UNREACHABLE(); | ||
| 33 | - } | ||
| 34 | - } | ||
| 35 | - | ||
| 36 | 20 | static inline constexpr size_t base64_encoded_size( | |
| 37 | 21 | size_t size, | |
| 38 | 22 | Base64Mode mode = Base64Mode::NORMAL) { | |
0 commit comments