~mdw
/
secnet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NEW etc.: Use NEW in all obvious places
[secnet]
/
ipaddr.c
diff --git
a/ipaddr.c
b/ipaddr.c
index
e6d2407
..
b3cd0a7
100644
(file)
--- a/
ipaddr.c
+++ b/
ipaddr.c
@@
-7,6
+7,7
@@
#include <stdio.h>
#include <string.h>
#include "ipaddr.h"
#include <stdio.h>
#include <string.h>
#include "ipaddr.h"
+#include "util.h"
#define DEFAULT_ALLOC 2
#define EXTEND_ALLOC_BY 4
#define DEFAULT_ALLOC 2
#define EXTEND_ALLOC_BY 4
@@
-14,7
+15,7
@@
struct subnet_list *subnet_list_new(void)
{
struct subnet_list *r;
struct subnet_list *subnet_list_new(void)
{
struct subnet_list *r;
-
r=safe_malloc(sizeof(*r),"subnet_list_new:list"
);
+
NEW(r
);
r->entries=0;
r->alloc=DEFAULT_ALLOC;
r->list=safe_malloc_ary(sizeof(*r->list),r->alloc,"subnet_list_new:data");
r->entries=0;
r->alloc=DEFAULT_ALLOC;
r->list=safe_malloc_ary(sizeof(*r->list),r->alloc,"subnet_list_new:data");
@@
-56,7
+57,7
@@
void subnet_list_append(struct subnet_list *a, uint32_t prefix, int len)
struct ipset *ipset_new(void)
{
struct ipset *r;
struct ipset *ipset_new(void)
{
struct ipset *r;
-
r=safe_malloc(sizeof(*r),"ipset_new:set"
);
+
NEW(r
);
r->l=0;
r->a=DEFAULT_ALLOC;
r->d=safe_malloc(sizeof(*r->d)*r->a,"ipset_new:data");
r->l=0;
r->a=DEFAULT_ALLOC;
r->d=safe_malloc(sizeof(*r->d)*r->a,"ipset_new:data");
@@
-130,7
+131,6
@@
static void ipset_append_range(struct ipset *a, struct iprange r)
a->d[a->l-1]=r;
}
a->d[a->l-1]=r;
}
-#define max(a,b) (a>b?a:b)
struct ipset *ipset_union(struct ipset *a, struct ipset *b)
{
struct ipset *c;
struct ipset *ipset_union(struct ipset *a, struct ipset *b)
{
struct ipset *c;
@@
-155,7
+155,7
@@
struct ipset *ipset_union(struct ipset *a, struct ipset *b)
ipset_append_range(c,r);
else if (r.a <= c->d[c->l-1].b+1)
/* Extends (or is consumed by) the last range */
ipset_append_range(c,r);
else if (r.a <= c->d[c->l-1].b+1)
/* Extends (or is consumed by) the last range */
- c->d[c->l-1].b=
max
(c->d[c->l-1].b, r.b);
+ c->d[c->l-1].b=
MAX
(c->d[c->l-1].b, r.b);
else
ipset_append_range(c,r);
}
else
ipset_append_range(c,r);
}