From 9f45aa737a10ee399f9a0576a30fa89bc5b81348 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 17 Mar 2008 13:26:11 +0100 Subject: [PATCH] geoip: remove redundant casts --- extensions/libxt_geoip.c | 4 ++-- extensions/xt_geoip.c | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/extensions/libxt_geoip.c b/extensions/libxt_geoip.c index 82e3375..1d3a1bb 100644 --- a/extensions/libxt_geoip.c +++ b/extensions/libxt_geoip.c @@ -80,7 +80,7 @@ get_country_subnets(u_int16_t cc, u_int32_t *count) stat("/var/geoip/geoipdb.idx", &buf); idxsz = buf.st_size/sizeof(struct geoip_index); - index = (struct geoip_index *)malloc(buf.st_size); + index = malloc(buf.st_size); fread(index, buf.st_size, 1, ixfd); @@ -110,7 +110,7 @@ get_country_subnets(u_int16_t cc, u_int32_t *count) fread(&db_nsubnets, sizeof(u_int16_t), 1, dbfd); - subnets = (struct geoip_subnet*)malloc(db_nsubnets * sizeof(struct geoip_subnet)); + subnets = malloc(db_nsubnets * sizeof(struct geoip_subnet)); if (!subnets) exit_error(OTHER_PROBLEM, diff --git a/extensions/xt_geoip.c b/extensions/xt_geoip.c index 61084db..953dede 100644 --- a/extensions/xt_geoip.c +++ b/extensions/xt_geoip.c @@ -32,15 +32,14 @@ static spinlock_t geoip_lock = SPIN_LOCK_UNLOCKED; static struct geoip_info *add_node(struct geoip_info *memcpy) { - struct geoip_info *p = - (struct geoip_info *)kmalloc(sizeof(struct geoip_info), GFP_KERNEL); + struct geoip_info *p = kmalloc(sizeof(struct geoip_info), GFP_KERNEL); struct geoip_subnet *s; if ((p == NULL) || (copy_from_user(p, memcpy, sizeof(struct geoip_info)) != 0)) return NULL; - s = (struct geoip_subnet *)kmalloc(p->count * sizeof(struct geoip_subnet), GFP_KERNEL); + s = kmalloc(p->count * sizeof(struct geoip_subnet), GFP_KERNEL); if ((s == NULL) || (copy_from_user(s, p->subnets, p->count * sizeof(struct geoip_subnet)) != 0)) return NULL; @@ -109,7 +108,7 @@ static bool xt_geoip_mt(const struct sk_buff *skb, unsigned int protoff, bool *hotdrop) { - const struct xt_geoip_match_info *info = (void*)matchinfo; + const struct xt_geoip_match_info *info = matchinfo; const struct geoip_info *node; /* This keeps the code sexy */ const struct iphdr *iph = ip_hdr(skb); u_int32_t ip, i, j; @@ -146,7 +145,7 @@ static bool xt_geoip_mt_checkentry(const char *tablename, unsigned int hook_mas) { - struct xt_geoip_match_info *info = (void *)matchinfo; + struct xt_geoip_match_info *info = matchinfo; struct geoip_info *node; u_int8_t i; @@ -176,7 +175,7 @@ static bool xt_geoip_mt_checkentry(const char *tablename, static void xt_geoip_mt_destroy(const struct xt_match *matcn, void *matchinfo) { - struct xt_geoip_match_info *info = (void *)matchinfo; + struct xt_geoip_match_info *info = matchinfo; struct geoip_info *node; /* this keeps the code sexy */ u_int8_t i;