Revert "Delete STACK_ARRAY macro, and use of alloca"
This reverts commit 74b373f04a69b279e45b0792d86c594cb33d22c1. Reason for revert: This breaks chromium, blocking webrtc from rolling. ... In file included from ../../third_party/webrtc\rtc_base/strings/string_builder.h:23: ../../third_party/webrtc\rtc_base/string_utils.h(54,28): error: implicit conversion loses integer precision: 'std::__1::basic_string<wchar_t, std::__1::char_traits<wchar_t>, std::__1::allocator<wchar_t> >::size_type' (aka 'unsigned long long') to 'int' [-Werror,-Wshorten-64-to-32] ws.size()); See https://logs.chromium.org/logs/chromium/buildbucket/cr-buildbucket.appspot.com/8912652299012991936/+/steps/compile__with_patch_/0/stdout Original change's description: > Delete STACK_ARRAY macro, and use of alloca > > Refactor the few uses of STACK_ARRAY to avoid an extra copy > on the stack. > > Bug: webrtc:6424 > Change-Id: I5c8f3c0381523db0ead31207d949df9a286c76ba > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/137806 > Commit-Queue: Niels Moller <nisse@webrtc.org> > Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#28038} TBR=kwiberg@webrtc.org,nisse@webrtc.org Change-Id: I223fceab60855dde363cc9ce8375e8f5cca43c02 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:6424 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/138209 Reviewed-by: Henrik Boström <hbos@webrtc.org> Commit-Queue: Henrik Boström <hbos@webrtc.org> Cr-Commit-Position: refs/heads/master@{#28043}
This commit is contained in:

committed by
Commit Bot

parent
2988acac05
commit
c1b36669db
@ -14,6 +14,7 @@
|
|||||||
|
|
||||||
#include "rtc_base/arraysize.h"
|
#include "rtc_base/arraysize.h"
|
||||||
#include "rtc_base/checks.h"
|
#include "rtc_base/checks.h"
|
||||||
|
#include "rtc_base/string_utils.h"
|
||||||
|
|
||||||
namespace rtc {
|
namespace rtc {
|
||||||
|
|
||||||
@ -44,22 +45,25 @@ bool hex_decode(char ch, unsigned char* val) {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t hex_encode_output_length(size_t srclen, char delimiter) {
|
// hex_encode, but separate each byte representation with a delimiter.
|
||||||
return delimiter && srclen > 0 ? (srclen * 3 - 1) : (srclen * 2);
|
// |delimiter| == 0 means no delimiter
|
||||||
}
|
// If the buffer is too short, we return 0
|
||||||
|
size_t hex_encode_with_delimiter(char* buffer,
|
||||||
// hex_encode shows the hex representation of binary data in ascii, with
|
size_t buflen,
|
||||||
// |delimiter| between bytes, or none if |delimiter| == 0.
|
const char* csource,
|
||||||
void hex_encode_with_delimiter(char* buffer,
|
size_t srclen,
|
||||||
const char* csource,
|
char delimiter) {
|
||||||
size_t srclen,
|
RTC_DCHECK(buffer); // TODO(kwiberg): estimate output size
|
||||||
char delimiter) {
|
if (buflen == 0)
|
||||||
RTC_DCHECK(buffer);
|
return 0;
|
||||||
|
|
||||||
// Init and check bounds.
|
// Init and check bounds.
|
||||||
const unsigned char* bsource =
|
const unsigned char* bsource =
|
||||||
reinterpret_cast<const unsigned char*>(csource);
|
reinterpret_cast<const unsigned char*>(csource);
|
||||||
size_t srcpos = 0, bufpos = 0;
|
size_t srcpos = 0, bufpos = 0;
|
||||||
|
size_t needed = delimiter ? (srclen * 3) : (srclen * 2 + 1);
|
||||||
|
if (buflen < needed)
|
||||||
|
return 0;
|
||||||
|
|
||||||
while (srcpos < srclen) {
|
while (srcpos < srclen) {
|
||||||
unsigned char ch = bsource[srcpos++];
|
unsigned char ch = bsource[srcpos++];
|
||||||
@ -73,6 +77,10 @@ void hex_encode_with_delimiter(char* buffer,
|
|||||||
++bufpos;
|
++bufpos;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Null terminate.
|
||||||
|
buffer[bufpos] = '\0';
|
||||||
|
return bufpos;
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
@ -88,11 +96,12 @@ std::string hex_encode(const char* source, size_t srclen) {
|
|||||||
std::string hex_encode_with_delimiter(const char* source,
|
std::string hex_encode_with_delimiter(const char* source,
|
||||||
size_t srclen,
|
size_t srclen,
|
||||||
char delimiter) {
|
char delimiter) {
|
||||||
std::string s(hex_encode_output_length(srclen, delimiter), 0);
|
const size_t kBufferSize = srclen * 3;
|
||||||
// TODO(nisse): When we can use C++17, switch the below hack with begin to
|
char* buffer = STACK_ARRAY(char, kBufferSize);
|
||||||
// just s.data().
|
size_t length =
|
||||||
hex_encode_with_delimiter(&*s.begin(), source, srclen, delimiter);
|
hex_encode_with_delimiter(buffer, kBufferSize, source, srclen, delimiter);
|
||||||
return s;
|
RTC_DCHECK(srclen == 0 || length > 0);
|
||||||
|
return std::string(buffer, length);
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t hex_decode(char* cbuffer,
|
size_t hex_decode(char* cbuffer,
|
||||||
|
@ -21,15 +21,31 @@
|
|||||||
#include <wchar.h>
|
#include <wchar.h>
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
|
||||||
|
#define alloca _alloca
|
||||||
#endif // WEBRTC_WIN
|
#endif // WEBRTC_WIN
|
||||||
|
|
||||||
#if defined(WEBRTC_POSIX)
|
#if defined(WEBRTC_POSIX)
|
||||||
|
#ifdef BSD
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#else // BSD
|
||||||
|
#include <alloca.h>
|
||||||
|
#endif // !BSD
|
||||||
#include <strings.h>
|
#include <strings.h>
|
||||||
#endif // WEBRTC_POSIX
|
#endif // WEBRTC_POSIX
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
// Generic string/memory utilities
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
#define STACK_ARRAY(TYPE, LEN) \
|
||||||
|
static_cast<TYPE*>(::alloca((LEN) * sizeof(TYPE)))
|
||||||
|
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
// Traits simplifies porting string functions to be CTYPE-agnostic
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
namespace rtc {
|
namespace rtc {
|
||||||
|
|
||||||
const size_t SIZE_UNKNOWN = static_cast<size_t>(-1);
|
const size_t SIZE_UNKNOWN = static_cast<size_t>(-1);
|
||||||
@ -49,10 +65,9 @@ size_t strcpyn(char* buffer,
|
|||||||
inline std::wstring ToUtf16(const char* utf8, size_t len) {
|
inline std::wstring ToUtf16(const char* utf8, size_t len) {
|
||||||
int len16 = ::MultiByteToWideChar(CP_UTF8, 0, utf8, static_cast<int>(len),
|
int len16 = ::MultiByteToWideChar(CP_UTF8, 0, utf8, static_cast<int>(len),
|
||||||
nullptr, 0);
|
nullptr, 0);
|
||||||
std::wstring ws(len16, 0);
|
wchar_t* ws = STACK_ARRAY(wchar_t, len16);
|
||||||
::MultiByteToWideChar(CP_UTF8, 0, utf8, static_cast<int>(len), &*ws.begin(),
|
::MultiByteToWideChar(CP_UTF8, 0, utf8, static_cast<int>(len), ws, len16);
|
||||||
ws.size());
|
return std::wstring(ws, len16);
|
||||||
return ws;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
inline std::wstring ToUtf16(const std::string& str) {
|
inline std::wstring ToUtf16(const std::string& str) {
|
||||||
@ -62,10 +77,10 @@ inline std::wstring ToUtf16(const std::string& str) {
|
|||||||
inline std::string ToUtf8(const wchar_t* wide, size_t len) {
|
inline std::string ToUtf8(const wchar_t* wide, size_t len) {
|
||||||
int len8 = ::WideCharToMultiByte(CP_UTF8, 0, wide, static_cast<int>(len),
|
int len8 = ::WideCharToMultiByte(CP_UTF8, 0, wide, static_cast<int>(len),
|
||||||
nullptr, 0, nullptr, nullptr);
|
nullptr, 0, nullptr, nullptr);
|
||||||
std::string ns(len8, 0);
|
char* ns = STACK_ARRAY(char, len8);
|
||||||
::WideCharToMultiByte(CP_UTF8, 0, wide, static_cast<int>(len), &*ns.begin(),
|
::WideCharToMultiByte(CP_UTF8, 0, wide, static_cast<int>(len), ns, len8,
|
||||||
ns.size(), nullptr, nullptr);
|
nullptr, nullptr);
|
||||||
return ns;
|
return std::string(ns, len8);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline std::string ToUtf8(const wchar_t* wide) {
|
inline std::string ToUtf8(const wchar_t* wide) {
|
||||||
|
Reference in New Issue
Block a user