zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete wrappers for snprintf and vsnprintf

Browse Source 
Bug: webrtc:6424
Change-Id: I99373dc86e25caff20111408b104ff5dafa7b711
Reviewed-on: https://webrtc-review.googlesource.com/c/106322
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25210}
This commit is contained in:
Niels Möller
2018-10-16 15:14:15 +02:00
committed by Commit Bot
parent 3100fc1f05
commit aba0633aaf
15 changed files with 36 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rtc_base/base64_unittest.cc
View File

@ -11,7 +11,6 @@
#include "rtc_base/third_party/base64/base64.h"
#include "rtc_base/gunit.h"
#include "rtc_base/logging.h"
#include "rtc_base/stringutils.h"
#include "rtc_base/testbase64.h"
@ -430,10 +429,10 @@ TEST(Base64, EncodeDecodeBattery) {
// try putting some extra stuff after the equals signs, or in between them
if (equals == 2) {
sprintfn(first_equals, 6, " = = ");
snprintf(first_equals, 6, " = = ");
len = first_equals - encode_buffer + 5;
} else {
sprintfn(first_equals, 6, " = ");
snprintf(first_equals, 6, " = ");
len = first_equals - encode_buffer + 3;
}
decoded2.assign("this junk should be ignored");

9
rtc_base/event_tracer.cc
View File

@ -20,7 +20,6 @@
#include "rtc_base/event.h"
#include "rtc_base/logging.h"
#include "rtc_base/platform_thread.h"
#include "rtc_base/stringutils.h"
#include "rtc_base/timeutils.h"
#include "rtc_base/trace_event.h"
@ -286,19 +285,19 @@ class EventLogger final {
}
break;
case TRACE_VALUE_TYPE_UINT:
print_length = sprintfn(&output[0], kTraceArgBufferLength, "%llu",
print_length = snprintf(&output[0], kTraceArgBufferLength, "%llu",
arg.value.as_uint);
break;
case TRACE_VALUE_TYPE_INT:
print_length = sprintfn(&output[0], kTraceArgBufferLength, "%lld",
print_length = snprintf(&output[0], kTraceArgBufferLength, "%lld",
arg.value.as_int);
break;
case TRACE_VALUE_TYPE_DOUBLE:
print_length = sprintfn(&output[0], kTraceArgBufferLength, "%f",
print_length = snprintf(&output[0], kTraceArgBufferLength, "%f",
arg.value.as_double);
break;
case TRACE_VALUE_TYPE_POINTER:
print_length = sprintfn(&output[0], kTraceArgBufferLength, "\"%p\"",
print_length = snprintf(&output[0], kTraceArgBufferLength, "\"%p\"",
arg.value.as_pointer);
break;
}

3
rtc_base/httpcommon.cc
View File

@ -32,7 +32,6 @@
#include "rtc_base/messagedigest.h"
#include "rtc_base/socketaddress.h"
#include "rtc_base/strings/string_builder.h"
#include "rtc_base/stringutils.h" // for strcpyn, _stricmp
#include "rtc_base/third_party/base64/base64.h" // for Base64
#include "rtc_base/zero_memory.h" // for ExplicitZeroMemory
@ -377,7 +376,7 @@ HttpAuthResult HttpAuthenticate(const char* challenge,
return HAR_IGNORE;
}
#else
sprintfn(spn, MAX_SPN, "HTTP/%s", server.ToString().c_str());
snprintf(spn, MAX_SPN, "HTTP/%s", server.ToString().c_str());
#endif
SecBuffer out_sec;

9
rtc_base/ipaddress.cc
View File

@ -162,11 +162,10 @@ std::string IPAddress::ToSensitiveString() const {
std::string result;
result.resize(INET6_ADDRSTRLEN);
in6_addr addr = ipv6_address();
size_t len =
rtc::sprintfn(&(result[0]), result.size(), "%x:%x:%x:x:x:x:x:x",
(addr.s6_addr[0] << 8) + addr.s6_addr[1],
(addr.s6_addr[2] << 8) + addr.s6_addr[3],
(addr.s6_addr[4] << 8) + addr.s6_addr[5]);
size_t len = snprintf(&(result[0]), result.size(), "%x:%x:%x:x:x:x:x:x",
(addr.s6_addr[0] << 8) + addr.s6_addr[1],
(addr.s6_addr[2] << 8) + addr.s6_addr[3],
(addr.s6_addr[4] << 8) + addr.s6_addr[5]);
result.resize(len);
return result;
}

4
rtc_base/location.cc
View File

@ -10,8 +10,6 @@
#include "rtc_base/location.h"
#include "rtc_base/stringutils.h"
namespace rtc {
Location::Location(const char* function_name, const char* file_and_line)
@ -31,7 +29,7 @@ Location& Location::operator=(const Location& other) {
std::string Location::ToString() const {
char buf[256];
sprintfn(buf, sizeof(buf), "%s@%s", function_name_, file_and_line_);
snprintf(buf, sizeof(buf), "%s@%s", function_name_, file_and_line_);
return buf;
}

26
rtc_base/stringutils.h
View File

@ -141,32 +141,6 @@ size_t strcatn(CTYPE* buffer,
return bufpos + strcpyn(buffer + bufpos, buflen - bufpos, source, srclen);
}
// Some compilers (clang specifically) require vsprintfn be defined before
// sprintfn.
template <class CTYPE>
size_t vsprintfn(CTYPE* buffer,
size_t buflen,
const CTYPE* format,
va_list args) {
int len = vsnprintf(buffer, buflen, format, args);
if ((len < 0) || (static_cast<size_t>(len) >= buflen)) {
len = static_cast<int>(buflen - 1);
buffer[len] = 0;
}
return len;
}
template <class CTYPE>
size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...);
template <class CTYPE>
size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) {
va_list args;
va_start(args, format);
size_t len = vsprintfn(buffer, buflen, format, args);
va_end(args);
return len;
}
///////////////////////////////////////////////////////////////////////////////
// Traits<char> specializations
///////////////////////////////////////////////////////////////////////////////

3
rtc_base/testutils.h
View File

@ -21,7 +21,6 @@
#include "rtc_base/checks.h"
#include "rtc_base/gunit.h"
#include "rtc_base/stream.h"
#include "rtc_base/stringutils.h"
namespace webrtc {
namespace testing {
@ -164,7 +163,7 @@ class StreamSource : public StreamInterface {
va_list args;
va_start(args, format);
char buffer[1024];
size_t len = vsprintfn(buffer, sizeof(buffer), format, args);
size_t len = vsnprintf(buffer, sizeof(buffer), format, args);
RTC_CHECK(len < sizeof(buffer) - 1);
va_end(args);
QueueData(buffer, len);

7
rtc_base/thread.cc
View File

@ -29,7 +29,6 @@
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/nullsocketserver.h"
#include "rtc_base/stringutils.h"
#include "rtc_base/timeutils.h"
#include "rtc_base/trace_event.h"
@ -221,8 +220,10 @@ bool Thread::SetName(const std::string& name, const void* obj) {
name_ = name;
if (obj) {
char buf[16];
sprintfn(buf, sizeof(buf), " 0x%p", obj);
// The %p specifier typically produce at most 16 hex digits, possibly with a
// 0x prefix. But format is implementation defined, so add some margin.
char buf[30];
snprintf(buf, sizeof(buf), " 0x%p", obj);
name_ += buf;
}
return true;

12
rtc_base/win32.cc
View File

@ -72,9 +72,9 @@ const char* inet_ntop_v4(const void* src, char* dst, socklen_t size) {
}
const struct in_addr* as_in_addr =
reinterpret_cast<const struct in_addr*>(src);
rtc::sprintfn(dst, size, "%d.%d.%d.%d", as_in_addr->S_un.S_un_b.s_b1,
as_in_addr->S_un.S_un_b.s_b2, as_in_addr->S_un.S_un_b.s_b3,
as_in_addr->S_un.S_un_b.s_b4);
snprintf(dst, size, "%d.%d.%d.%d", as_in_addr->S_un.S_un_b.s_b1,
as_in_addr->S_un.S_un_b.s_b2, as_in_addr->S_un.S_un_b.s_b3,
as_in_addr->S_un.S_un_b.s_b4);
return dst;
}
@ -127,7 +127,7 @@ const char* inet_ntop_v6(const void* src, char* dst, socklen_t size) {
*cursor++ = ':';
*cursor++ = ':';
if (maxpos == 4) {
cursor += rtc::sprintfn(cursor, INET6_ADDRSTRLEN - 2, "ffff:");
cursor += snprintf(cursor, INET6_ADDRSTRLEN - 2, "ffff:");
}
const struct in_addr* as_v4 =
reinterpret_cast<const struct in_addr*>(&(as_shorts[6]));
@ -136,8 +136,8 @@ const char* inet_ntop_v6(const void* src, char* dst, socklen_t size) {
} else {
for (int i = 0; i < run_array_size; ++i) {
if (runpos[i] == -1) {
cursor += rtc::sprintfn(cursor, INET6_ADDRSTRLEN - (cursor - dst), "%x",
NetworkToHost16(as_shorts[i]));
cursor += snprintf(cursor, INET6_ADDRSTRLEN - (cursor - dst), "%x",
NetworkToHost16(as_shorts[i]));
if (i != 7 && runpos[i + 1] != 1) {
*cursor++ = ':';
}