Revert previous commit (r3889). Windows code has to be cleaned before this
change.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3890 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/common/network/TcpSocket.cxx b/common/network/TcpSocket.cxx
index 7056a08..7ceff0b 100644
--- a/common/network/TcpSocket.cxx
+++ b/common/network/TcpSocket.cxx
@@ -238,9 +238,9 @@
char* name = inet_ntoa(addr);
if (name) {
- return safe_strdup(name);
+ return rfb::strDup(name);
} else {
- return safe_strdup("");
+ return rfb::strDup("");
}
}
@@ -268,9 +268,9 @@
char* name = inet_ntoa(addr);
if (name) {
- return safe_strdup(name);
+ return rfb::strDup(name);
} else {
- return safe_strdup("");
+ return rfb::strDup("");
}
}
@@ -451,7 +451,7 @@
TcpFilter::TcpFilter(const char* spec) {
rfb::CharArray tmp;
- tmp.buf = safe_strdup(spec);
+ tmp.buf = rfb::strDup(spec);
while (tmp.buf) {
rfb::CharArray first;
rfb::strSplit(tmp.buf, ',', &first.buf, &tmp.buf);
@@ -541,9 +541,9 @@
in_addr tmp;
rfb::CharArray addr, mask;
tmp.s_addr = p.address;
- addr.buf = safe_strdup(inet_ntoa(tmp));
+ addr.buf = rfb::strDup(inet_ntoa(tmp));
tmp.s_addr = p.mask;
- mask.buf = safe_strdup(inet_ntoa(tmp));
+ mask.buf = rfb::strDup(inet_ntoa(tmp));
char* result = new char[strlen(addr.buf)+1+strlen(mask.buf)+1+1];
switch (p.action) {
case Accept: result[0] = '+'; break;