From: David Lamparter <equinox@diac24.net>
Date: Wed, 6 Mar 2019 14:54:44 +0000 (+0100)
Subject: Merge pull request #3869 from qlyoung/cocci-fixes
X-Git-Tag: 7.1_pulled~195
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=d3b05897edff14ceb71c2f5603a9fcdb1ae10c83;p=matthieu%2Ffrr.git

Merge pull request #3869 from qlyoung/cocci-fixes

Assorted Coccinelle fixes
---

d3b05897edff14ceb71c2f5603a9fcdb1ae10c83
diff --cc lib/if_rmap.c
index 53bbcbfe57,f8e500f43d..955c1417c4
--- a/lib/if_rmap.c
+++ b/lib/if_rmap.c
@@@ -63,10 -62,9 +60,9 @@@ struct if_rmap *if_rmap_lookup(struct i
  	/* temporary copy */
  	key.ifname = (ifname) ? XSTRDUP(MTYPE_IF_RMAP_NAME, ifname) : NULL;
  
 -	if_rmap = hash_lookup(ifrmaphash, &key);
 +	if_rmap = hash_lookup(ctx->ifrmaphash, &key);
  
- 	if (key.ifname)
- 		XFREE(MTYPE_IF_RMAP_NAME, key.ifname);
+ 	XFREE(MTYPE_IF_RMAP_NAME, key.ifname);
  
  	return if_rmap;
  }
@@@ -104,10 -98,9 +100,9 @@@ static struct if_rmap *if_rmap_get(stru
  	/* temporary copy */
  	key.ifname = (ifname) ? XSTRDUP(MTYPE_IF_RMAP_NAME, ifname) : NULL;
  
 -	ret = hash_get(ifrmaphash, &key, if_rmap_hash_alloc);
 +	ret = hash_get(ctx->ifrmaphash, &key, if_rmap_hash_alloc);
  
- 	if (key.ifname)
- 		XFREE(MTYPE_IF_RMAP_NAME, key.ifname);
+ 	XFREE(MTYPE_IF_RMAP_NAME, key.ifname);
  
  	return ret;
  }
@@@ -133,12 -125,10 +128,10 @@@ static struct if_rmap *if_rmap_set(stru
  {
  	struct if_rmap *if_rmap;
  
 -	if_rmap = if_rmap_get(ifname);
 +	if_rmap = if_rmap_get(ctx, ifname);
  
  	if (type == IF_RMAP_IN) {
- 		if (if_rmap->routemap[IF_RMAP_IN])
- 			XFREE(MTYPE_IF_RMAP_NAME,
- 			      if_rmap->routemap[IF_RMAP_IN]);
+ 		XFREE(MTYPE_IF_RMAP_NAME, if_rmap->routemap[IF_RMAP_IN]);
  		if_rmap->routemap[IF_RMAP_IN] =
  			XSTRDUP(MTYPE_IF_RMAP_NAME, routemap_name);
  	}