Delete wrappers for snprintf and vsnprintf
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}diff --git a/examples/peerconnection/client/linux/main_wnd.cc b/examples/peerconnection/client/linux/main_wnd.cc
index 52b0d88..2f7777d 100644
--- a/examples/peerconnection/client/linux/main_wnd.cc
+++ b/examples/peerconnection/client/linux/main_wnd.cc
@@ -18,11 +18,8 @@
#include "examples/peerconnection/client/defaults.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/stringutils.h"
#include "third_party/libyuv/include/libyuv/convert_from.h"
-using rtc::sprintfn;
-
namespace {
//
@@ -150,7 +147,7 @@
autoconnect_(autoconnect),
autocall_(autocall) {
char buffer[10];
- sprintfn(buffer, sizeof(buffer), "%i", port);
+ snprintf(buffer, sizeof(buffer), "%i", port);
port_ = buffer;
}
diff --git a/examples/peerconnection/client/main_wnd.cc b/examples/peerconnection/client/main_wnd.cc
index 3ad2488..8edd1e7 100644
--- a/examples/peerconnection/client/main_wnd.cc
+++ b/examples/peerconnection/client/main_wnd.cc
@@ -17,14 +17,11 @@
#include "rtc_base/arraysize.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/stringutils.h"
#include "third_party/libyuv/include/libyuv/convert_argb.h"
ATOM MainWnd::wnd_class_ = 0;
const wchar_t MainWnd::kClassName[] = L"WebRTC_MainWnd";
-using rtc::sprintfn;
-
namespace {
const char kConnecting[] = "Connecting... ";
@@ -86,8 +83,8 @@
server_(server),
auto_connect_(auto_connect),
auto_call_(auto_call) {
- char buffer[10] = {0};
- sprintfn(buffer, sizeof(buffer), "%i", port);
+ char buffer[10];
+ snprintf(buffer, sizeof(buffer), "%i", port);
port_ = buffer;
}
diff --git a/examples/peerconnection/client/peer_connection_client.cc b/examples/peerconnection/client/peer_connection_client.cc
index bb79d16..f173e42 100644
--- a/examples/peerconnection/client/peer_connection_client.cc
+++ b/examples/peerconnection/client/peer_connection_client.cc
@@ -14,14 +14,11 @@
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/nethelpers.h"
-#include "rtc_base/stringutils.h"
#ifdef WIN32
#include "rtc_base/win32socketserver.h"
#endif
-using rtc::sprintfn;
-
namespace {
// This is our magical hangup signal.
@@ -136,7 +133,7 @@
hanging_get_.reset(CreateClientSocket(server_address_.ipaddr().family()));
InitSocketSignals();
char buffer[1024];
- sprintfn(buffer, sizeof(buffer), "GET /sign_in?%s HTTP/1.0\r\n\r\n",
+ snprintf(buffer, sizeof(buffer), "GET /sign_in?%s HTTP/1.0\r\n\r\n",
client_name_.c_str());
onconnect_data_ = buffer;
@@ -158,9 +155,9 @@
return false;
char headers[1024];
- sprintfn(headers, sizeof(headers),
+ snprintf(headers, sizeof(headers),
"POST /message?peer_id=%i&to=%i HTTP/1.0\r\n"
- "Content-Length: %i\r\n"
+ "Content-Length: %zu\r\n"
"Content-Type: text/plain\r\n"
"\r\n",
my_id_, peer_id, message.length());
@@ -190,7 +187,7 @@
if (my_id_ != -1) {
char buffer[1024];
- sprintfn(buffer, sizeof(buffer),
+ snprintf(buffer, sizeof(buffer),
"GET /sign_out?peer_id=%i HTTP/1.0\r\n\r\n", my_id_);
onconnect_data_ = buffer;
return ConnectControlSocket();
@@ -237,7 +234,7 @@
void PeerConnectionClient::OnHangingGetConnect(rtc::AsyncSocket* socket) {
char buffer[1024];
- sprintfn(buffer, sizeof(buffer), "GET /wait?peer_id=%i HTTP/1.0\r\n\r\n",
+ snprintf(buffer, sizeof(buffer), "GET /wait?peer_id=%i HTTP/1.0\r\n\r\n",
my_id_);
int len = static_cast<int>(strlen(buffer));
int sent = socket->Send(buffer, len);
diff --git a/examples/peerconnection/server/peer_channel.cc b/examples/peerconnection/server/peer_channel.cc
index 6ef08d7..b23b7e0 100644
--- a/examples/peerconnection/server/peer_channel.cc
+++ b/examples/peerconnection/server/peer_channel.cc
@@ -19,9 +19,6 @@
#include "examples/peerconnection/server/data_socket.h"
#include "examples/peerconnection/server/utils.h"
#include "rtc_base/stringencode.h"
-#include "rtc_base/stringutils.h"
-
-using rtc::sprintfn;
// Set to the peer id of the originator when messages are being
// exchanged between peers, but set to the id of the receiving peer
@@ -98,7 +95,7 @@
// name, 11-digit int, 1-digit bool, newline, null
char entry[kMaxNameLength + 15];
- sprintfn(entry, sizeof(entry), "%s,%d,%d\n",
+ snprintf(entry, sizeof(entry), "%s,%d,%d\n",
name_.substr(0, kMaxNameLength).c_str(), id_, connected_);
return entry;
}