Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit bbce6f6

Browse files
Merge pull request #210 from jboynes/undeprecate_IPAddress
Replace use of deprecated sprintf in IPAddress
2 parents 6cd8d8a + 0365dc3 commit bbce6f6

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

‎api/IPAddress.cpp‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,26 +96,20 @@ IPAddress::IPAddress(const char *address)
9696

9797
String IPAddress::toString4() const
9898
{
99-
#pragma GCC diagnostic push
100-
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
10199
char szRet[16];
102-
sprintf(szRet,"%u.%u.%u.%u", _address.bytes[IPADDRESS_V4_BYTES_INDEX], _address.bytes[IPADDRESS_V4_BYTES_INDEX + 1], _address.bytes[IPADDRESS_V4_BYTES_INDEX + 2], _address.bytes[IPADDRESS_V4_BYTES_INDEX + 3]);
100+
snprintf(szRet,sizeof(szRet), "%u.%u.%u.%u", _address.bytes[IPADDRESS_V4_BYTES_INDEX], _address.bytes[IPADDRESS_V4_BYTES_INDEX + 1], _address.bytes[IPADDRESS_V4_BYTES_INDEX + 2], _address.bytes[IPADDRESS_V4_BYTES_INDEX + 3]);
103101
return String(szRet);
104-
#pragma GCC diagnostic pop
105102
}
106103

107104
String IPAddress::toString6() const
108105
{
109-
#pragma GCC diagnostic push
110-
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
111106
char szRet[40];
112-
sprintf(szRet,"%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x",
107+
snprintf(szRet,sizeof(szRet), "%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x",
113108
_address.bytes[0], _address.bytes[1], _address.bytes[2], _address.bytes[3],
114109
_address.bytes[4], _address.bytes[5], _address.bytes[6], _address.bytes[7],
115110
_address.bytes[8], _address.bytes[9], _address.bytes[10], _address.bytes[11],
116111
_address.bytes[12], _address.bytes[13], _address.bytes[14], _address.bytes[15]);
117112
return String(szRet);
118-
#pragma GCC diagnostic pop
119113
}
120114

121115
String IPAddress::toString() const

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /