X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=ipaddr.c;h=9302925b2039d8f0f6b72717a901c14e09b36498;hb=5e7a63be9a512bf979e5538e6a694d5fd66b9380;hp=4b5b48aa43d0cf3b6f889ebd049cced818638557;hpb=952f601f3501b0e40083f5d1a6ef166b8b62a813;p=secnet.git diff --git a/ipaddr.c b/ipaddr.c index 4b5b48a..9302925 100644 --- a/ipaddr.c +++ b/ipaddr.c @@ -313,18 +313,12 @@ struct subnet_list *ipset_to_subnet_list(struct ipset *is) return r; } -#define IPADDR_NBUFS_SHIFT 4 -#define IPADDR_NBUFS (1 << IPADDR_NBUFS_SHIFT) #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 */