~mdw
/
secnet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Static buffers: ipaddr_getbuf: Rename some variables
[secnet]
/
ipaddr.c
diff --git
a/ipaddr.c
b/ipaddr.c
index
aa770f8
..
b45afef
100644
(file)
--- a/
ipaddr.c
+++ b/
ipaddr.c
@@
-58,7
+58,7
@@
struct ipset *ipset_new(void)
NEW(r);
r->l=0;
r->a=DEFAULT_ALLOC;
NEW(r);
r->l=0;
r->a=DEFAULT_ALLOC;
-
r->d=safe_malloc(sizeof(*r->d)*r->a,"ipset_new:data"
);
+
NEW_ARY(r->d,r->a
);
return r;
}
return r;
}
@@
-319,12
+319,12
@@
struct subnet_list *ipset_to_subnet_list(struct ipset *is)
static char *ipaddr_getbuf(void)
{
static char *ipaddr_getbuf(void)
{
- static int
ipaddr_bufnum
;
- static char
ipaddr_
bufs[IPADDR_NBUFS][IPADDR_BUFLEN];
+ static int
b
;
+ static char bufs[IPADDR_NBUFS][IPADDR_BUFLEN];
-
ipaddr_bufnum
++;
-
ipaddr_bufnum
&= IPADDR_NBUFS-1;
- return
ipaddr_bufs[ipaddr_bufnum
];
+
b
++;
+
b
&= IPADDR_NBUFS-1;
+ return
bufs[b
];
}
/* The string buffer must be at least 16 bytes long */
}
/* The string buffer must be at least 16 bytes long */