Skip to content

src: remove base64_select_table and base64_table #44425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nodejs-github-bot merged 1 commit into from
Aug 31, 2022
Merged

src: remove base64_select_table and base64_table #44425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.
  • Loading branch information
@tniessen
tniessen committed Aug 28, 2022
commit 9767bedabda3f623f2be6902fd04fe8b9dd4a8fa
6 changes: 5 additions & 1 deletion src/base64-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@

namespace node {

static constexpr char base64_table_url[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"abcdefghijklmnopqrstuvwxyz"
"0123456789-_";

extern const int8_t unbase64_table[256];


Expand Down Expand Up @@ -144,7 +148,7 @@ inline size_t base64_encode(const char* src,
unsigned k;
unsigned n;

const char* table = base64_select_table(mode);
const char* table = base64_table_url;

i = 0;
k = 0;
Expand Down
16 changes: 0 additions & 16 deletions src/base64.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,6 @@ enum class Base64Mode {
URL
};

static constexpr char base64_table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"abcdefghijklmnopqrstuvwxyz"
"0123456789+/";

static constexpr char base64_table_url[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"abcdefghijklmnopqrstuvwxyz"
"0123456789-_";

static inline const char* base64_select_table(Base64Mode mode) {
switch (mode) {
case Base64Mode::NORMAL: return base64_table;
case Base64Mode::URL: return base64_table_url;
default: UNREACHABLE();
}
}

static inline constexpr size_t base64_encoded_size(
size_t size,
Base64Mode mode = Base64Mode::NORMAL) {
Expand Down