kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no more static buffers for iptoa and iprtoa

Browse Source
This commit is contained in:
ac-stef
2017-06-27 15:15:22 +02:00
parent 2147d60934
commit f581506960
4 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/tools.cpp
+7 -13
View File
@@ -503,23 +503,17 @@ const char *atoipr(const char *s, iprange *ir)
return s;
}
const char *iptoa(const enet_uint32 ip)
const char *iptoa(const enet_uint32 ip, char *b)
{
static string s[2];
static int buf = 0;
buf = (buf + 1) % 2;
formatstring(s[buf])("%d.%d.%d.%d", (ip >> 24) & 255, (ip >> 16) & 255, (ip >> 8) & 255, ip & 255);
return s[buf];
formatstring(b)("%d.%d.%d.%d", (ip >> 24) & 255, (ip >> 16) & 255, (ip >> 8) & 255, ip & 255);
return b;
}
const char *iprtoa(const struct iprange &ipr)
const char *iprtoa(const struct iprange &ipr, char *b)
{
static string s[2];
static int buf = 0;
buf = (buf + 1) % 2;
if(ipr.lr == ipr.ur) copystring(s[buf], iptoa(ipr.lr));
else formatstring(s[buf])("%s-%s", iptoa(ipr.lr), iptoa(ipr.ur));
return s[buf];
if(ipr.lr == ipr.ur) return iptoa(ipr.lr, b);
else formatstring(b)("%d.%d.%d.%d-%d.%d.%d.%d", (ipr.lr >> 24) & 255, (ipr.lr >> 16) & 255, (ipr.lr >> 8) & 255, ipr.lr & 255, (ipr.ur >> 24) & 255, (ipr.ur >> 16) & 255, (ipr.ur >> 8) & 255, ipr.ur & 255);
return b;
}
int cmpiprange(const struct iprange *a, const struct iprange *b)