chiark
/
gitweb
/
~ianmdlvl
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Static buffers: Provide new rotating static buffer macros
[secnet.git]
/
ipaddr.c
diff --git
a/ipaddr.c
b/ipaddr.c
index 4b5b48aa43d0cf3b6f889ebd049cced818638557..9302925b2039d8f0f6b72717a901c14e09b36498 100644
(file)
--- a/
ipaddr.c
+++ b/
ipaddr.c
@@
-313,18
+313,12
@@
struct subnet_list *ipset_to_subnet_list(struct ipset *is)
return r;
}
return r;
}
-#define IPADDR_NBUFS_SHIFT 4
-#define IPADDR_NBUFS (1 << IPADDR_NBUFS_SHIFT)
#define IPADDR_BUFLEN 20
static char *ipaddr_getbuf(void)
{
#define IPADDR_BUFLEN 20
static char *ipaddr_getbuf(void)
{
- static int ipaddr_bufnum;
- static char ipaddr_bufs[IPADDR_NBUFS][IPADDR_BUFLEN];
-
- ipaddr_bufnum++;
- ipaddr_bufnum &= IPADDR_NBUFS-1;
- return ipaddr_bufs[ipaddr_bufnum];
+ SBUF_DEFINE(16, IPADDR_BUFLEN);
+ return SBUF;
}
/* The string buffer must be at least 16 bytes long */
}
/* The string buffer must be at least 16 bytes long */