| Index: webrtc/base/base64.cc
|
| diff --git a/webrtc/base/base64.cc b/webrtc/base/base64.cc
|
| index effc390f057edcf161c43b4581708af0b1b0a58c..8fa1c818fa3a467699f90cb9112db955cf31b86c 100644
|
| --- a/webrtc/base/base64.cc
|
| +++ b/webrtc/base/base64.cc
|
| @@ -30,49 +30,47 @@ static const unsigned char sp = 0xFE; // Whitespace
|
| static const unsigned char il = 0xFF; // Illegal base64 character
|
|
|
| const char Base64::Base64Table[] =
|
| -// 0000000000111111111122222222223333333333444444444455555555556666
|
| -// 0123456789012345678901234567890123456789012345678901234567890123
|
| - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
| + // 0000000000111111111122222222223333333333444444444455555555556666
|
| + // 0123456789012345678901234567890123456789012345678901234567890123
|
| + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
|
|
| // Decode Table gives the index of any valid base64 character in the
|
| // Base64 table
|
| // 65 == A, 97 == a, 48 == 0, 43 == +, 47 == /
|
|
|
| const unsigned char Base64::DecodeTable[] = {
|
| -// 0 1 2 3 4 5 6 7 8 9
|
| - il,il,il,il,il,il,il,il,il,sp, // 0 - 9
|
| - sp,sp,sp,sp,il,il,il,il,il,il, // 10 - 19
|
| - il,il,il,il,il,il,il,il,il,il, // 20 - 29
|
| - il,il,sp,il,il,il,il,il,il,il, // 30 - 39
|
| - il,il,il,62,il,il,il,63,52,53, // 40 - 49
|
| - 54,55,56,57,58,59,60,61,il,il, // 50 - 59
|
| - il,pd,il,il,il, 0, 1, 2, 3, 4, // 60 - 69
|
| - 5, 6, 7, 8, 9,10,11,12,13,14, // 70 - 79
|
| - 15,16,17,18,19,20,21,22,23,24, // 80 - 89
|
| - 25,il,il,il,il,il,il,26,27,28, // 90 - 99
|
| - 29,30,31,32,33,34,35,36,37,38, // 100 - 109
|
| - 39,40,41,42,43,44,45,46,47,48, // 110 - 119
|
| - 49,50,51,il,il,il,il,il,il,il, // 120 - 129
|
| - il,il,il,il,il,il,il,il,il,il, // 130 - 139
|
| - il,il,il,il,il,il,il,il,il,il, // 140 - 149
|
| - il,il,il,il,il,il,il,il,il,il, // 150 - 159
|
| - il,il,il,il,il,il,il,il,il,il, // 160 - 169
|
| - il,il,il,il,il,il,il,il,il,il, // 170 - 179
|
| - il,il,il,il,il,il,il,il,il,il, // 180 - 189
|
| - il,il,il,il,il,il,il,il,il,il, // 190 - 199
|
| - il,il,il,il,il,il,il,il,il,il, // 200 - 209
|
| - il,il,il,il,il,il,il,il,il,il, // 210 - 219
|
| - il,il,il,il,il,il,il,il,il,il, // 220 - 229
|
| - il,il,il,il,il,il,il,il,il,il, // 230 - 239
|
| - il,il,il,il,il,il,il,il,il,il, // 240 - 249
|
| - il,il,il,il,il,il // 250 - 255
|
| + // 0 1 2 3 4 5 6 7 8 9
|
| + il, il, il, il, il, il, il, il, il, sp, // 0 - 9
|
| + sp, sp, sp, sp, il, il, il, il, il, il, // 10 - 19
|
| + il, il, il, il, il, il, il, il, il, il, // 20 - 29
|
| + il, il, sp, il, il, il, il, il, il, il, // 30 - 39
|
| + il, il, il, 62, il, il, il, 63, 52, 53, // 40 - 49
|
| + 54, 55, 56, 57, 58, 59, 60, 61, il, il, // 50 - 59
|
| + il, pd, il, il, il, 0, 1, 2, 3, 4, // 60 - 69
|
| + 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, // 70 - 79
|
| + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, // 80 - 89
|
| + 25, il, il, il, il, il, il, 26, 27, 28, // 90 - 99
|
| + 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, // 100 - 109
|
| + 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, // 110 - 119
|
| + 49, 50, 51, il, il, il, il, il, il, il, // 120 - 129
|
| + il, il, il, il, il, il, il, il, il, il, // 130 - 139
|
| + il, il, il, il, il, il, il, il, il, il, // 140 - 149
|
| + il, il, il, il, il, il, il, il, il, il, // 150 - 159
|
| + il, il, il, il, il, il, il, il, il, il, // 160 - 169
|
| + il, il, il, il, il, il, il, il, il, il, // 170 - 179
|
| + il, il, il, il, il, il, il, il, il, il, // 180 - 189
|
| + il, il, il, il, il, il, il, il, il, il, // 190 - 199
|
| + il, il, il, il, il, il, il, il, il, il, // 200 - 209
|
| + il, il, il, il, il, il, il, il, il, il, // 210 - 219
|
| + il, il, il, il, il, il, il, il, il, il, // 220 - 229
|
| + il, il, il, il, il, il, il, il, il, il, // 230 - 239
|
| + il, il, il, il, il, il, il, il, il, il, // 240 - 249
|
| + il, il, il, il, il, il // 250 - 255
|
| };
|
|
|
| bool Base64::IsBase64Char(char ch) {
|
| - return (('A' <= ch) && (ch <= 'Z')) ||
|
| - (('a' <= ch) && (ch <= 'z')) ||
|
| - (('0' <= ch) && (ch <= '9')) ||
|
| - (ch == '+') || (ch == '/');
|
| + return (('A' <= ch) && (ch <= 'Z')) || (('a' <= ch) && (ch <= 'z')) ||
|
| + (('0' <= ch) && (ch <= '9')) || (ch == '+') || (ch == '/');
|
| }
|
|
|
| bool Base64::GetNextBase64Char(char ch, char* next_ch) {
|
| @@ -95,7 +93,8 @@ bool Base64::IsBase64Encoded(const std::string& str) {
|
| return true;
|
| }
|
|
|
| -void Base64::EncodeFromArray(const void* data, size_t len,
|
| +void Base64::EncodeFromArray(const void* data,
|
| + size_t len,
|
| std::string* result) {
|
| RTC_DCHECK(NULL != result);
|
| result->clear();
|
| @@ -135,10 +134,13 @@ void Base64::EncodeFromArray(const void* data, size_t len,
|
| }
|
| }
|
|
|
| -size_t Base64::GetNextQuantum(DecodeFlags parse_flags, bool illegal_pads,
|
| - const char* data, size_t len, size_t* dpos,
|
| - unsigned char qbuf[4], bool* padded)
|
| -{
|
| +size_t Base64::GetNextQuantum(DecodeFlags parse_flags,
|
| + bool illegal_pads,
|
| + const char* data,
|
| + size_t len,
|
| + size_t* dpos,
|
| + unsigned char qbuf[4],
|
| + bool* padded) {
|
| size_t byte_len = 0, pad_len = 0, pad_start = 0;
|
| for (; (byte_len < 4) && (*dpos < len); ++*dpos) {
|
| qbuf[byte_len] = DecodeTable[static_cast<unsigned char>(data[*dpos])];
|
| @@ -189,14 +191,20 @@ size_t Base64::GetNextQuantum(DecodeFlags parse_flags, bool illegal_pads,
|
| return byte_len;
|
| }
|
|
|
| -bool Base64::DecodeFromArray(const char* data, size_t len, DecodeFlags flags,
|
| - std::string* result, size_t* data_used) {
|
| - return DecodeFromArrayTemplate<std::string>(
|
| - data, len, flags, result, data_used);
|
| +bool Base64::DecodeFromArray(const char* data,
|
| + size_t len,
|
| + DecodeFlags flags,
|
| + std::string* result,
|
| + size_t* data_used) {
|
| + return DecodeFromArrayTemplate<std::string>(data, len, flags, result,
|
| + data_used);
|
| }
|
|
|
| -bool Base64::DecodeFromArray(const char* data, size_t len, DecodeFlags flags,
|
| - vector<char>* result, size_t* data_used) {
|
| +bool Base64::DecodeFromArray(const char* data,
|
| + size_t len,
|
| + DecodeFlags flags,
|
| + vector<char>* result,
|
| + size_t* data_used) {
|
| return DecodeFromArrayTemplate<vector<char>>(data, len, flags, result,
|
| data_used);
|
| }
|
| @@ -210,17 +218,18 @@ bool Base64::DecodeFromArray(const char* data,
|
| data_used);
|
| }
|
|
|
| -template<typename T>
|
| -bool Base64::DecodeFromArrayTemplate(const char* data, size_t len,
|
| - DecodeFlags flags, T* result,
|
| - size_t* data_used)
|
| -{
|
| +template <typename T>
|
| +bool Base64::DecodeFromArrayTemplate(const char* data,
|
| + size_t len,
|
| + DecodeFlags flags,
|
| + T* result,
|
| + size_t* data_used) {
|
| RTC_DCHECK(NULL != result);
|
| RTC_DCHECK(flags <= (DO_PARSE_MASK | DO_PAD_MASK | DO_TERM_MASK));
|
|
|
| const DecodeFlags parse_flags = flags & DO_PARSE_MASK;
|
| - const DecodeFlags pad_flags = flags & DO_PAD_MASK;
|
| - const DecodeFlags term_flags = flags & DO_TERM_MASK;
|
| + const DecodeFlags pad_flags = flags & DO_PAD_MASK;
|
| + const DecodeFlags term_flags = flags & DO_TERM_MASK;
|
| RTC_DCHECK(0 != parse_flags);
|
| RTC_DCHECK(0 != pad_flags);
|
| RTC_DCHECK(0 != term_flags);
|
| @@ -232,8 +241,8 @@ bool Base64::DecodeFromArrayTemplate(const char* data, size_t len,
|
| bool success = true, padded;
|
| unsigned char c, qbuf[4];
|
| while (dpos < len) {
|
| - size_t qlen = GetNextQuantum(parse_flags, (DO_PAD_NO == pad_flags),
|
| - data, len, &dpos, qbuf, &padded);
|
| + size_t qlen = GetNextQuantum(parse_flags, (DO_PAD_NO == pad_flags), data,
|
| + len, &dpos, qbuf, &padded);
|
| c = (qbuf[0] << 2) | ((qbuf[1] >> 4) & 0x3);
|
| if (qlen >= 2) {
|
| result->push_back(c);
|
| @@ -266,4 +275,4 @@ bool Base64::DecodeFromArrayTemplate(const char* data, size_t len,
|
| return success;
|
| }
|
|
|
| -} // namespace rtc
|
| +} // namespace rtc
|
|
|