[v2,2/7] acl: remove unnecessary null checks
Checks
Commit Message
This function already handles NULL as valid input.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
app/test/test_acl.c | 12 ++++--------
lib/acl/rte_acl.h | 1 +
lib/table/rte_swx_table_wm.c | 3 +--
lib/table/rte_table_acl.c | 15 +++++----------
4 files changed, 11 insertions(+), 20 deletions(-)
@@ -1171,8 +1171,7 @@ test_create_find_add(void)
printf("Line %i: Creating context with existing name "
"test failed!\n",
__LINE__);
- if (tmp)
- rte_acl_free(tmp);
+ rte_acl_free(tmp);
goto err;
}
@@ -1182,8 +1181,7 @@ test_create_find_add(void)
printf("Line %i: Creating context with existing "
"name test 2 failed!\n",
__LINE__);
- if (tmp)
- rte_acl_free(tmp);
+ rte_acl_free(tmp);
goto err;
}
@@ -1191,16 +1189,14 @@ test_create_find_add(void)
tmp = rte_acl_find_existing(acx_name);
if (tmp != acx) {
printf("Line %i: Finding %s failed!\n", __LINE__, acx_name);
- if (tmp)
- rte_acl_free(tmp);
+ rte_acl_free(tmp);
goto err;
}
tmp = rte_acl_find_existing(acx2_name);
if (tmp != acx2) {
printf("Line %i: Finding %s failed!\n", __LINE__, acx2_name);
- if (tmp)
- rte_acl_free(tmp);
+ rte_acl_free(tmp);
goto err;
}
@@ -165,6 +165,7 @@ rte_acl_find_existing(const char *name);
*
* @param ctx
* ACL context to free
+ * If NULL then, the function does nothing.
*/
void
rte_acl_free(struct rte_acl_ctx *ctx);
@@ -375,8 +375,7 @@ table_free(void *table)
if (!t)
return;
- if (t->acl_ctx)
- rte_acl_free(t->acl_ctx);
+ rte_acl_free(t->acl_ctx);
env_free(t, t->total_size);
}
@@ -148,8 +148,7 @@ rte_table_acl_free(void *table)
}
/* Free previously allocated resources */
- if (acl->ctx != NULL)
- rte_acl_free(acl->ctx);
+ rte_acl_free(acl->ctx);
rte_free(acl);
@@ -320,8 +319,7 @@ rte_table_acl_entry_add(
}
/* Commit changes */
- if (acl->ctx != NULL)
- rte_acl_free(acl->ctx);
+ rte_acl_free(acl->ctx);
acl->ctx = ctx;
*key_found = 0;
*entry_ptr = &acl->memory[free_pos * acl->entry_size];
@@ -400,8 +398,7 @@ rte_table_acl_entry_delete(
}
/* Commit changes */
- if (acl->ctx != NULL)
- rte_acl_free(acl->ctx);
+ rte_acl_free(acl->ctx);
acl->ctx = ctx;
*key_found = 1;
@@ -577,8 +574,7 @@ rte_table_acl_entry_add_bulk(
}
/* Commit changes */
- if (acl->ctx != NULL)
- rte_acl_free(acl->ctx);
+ rte_acl_free(acl->ctx);
acl->ctx = ctx;
for (i = 0; i < n_keys; i++) {
@@ -696,8 +692,7 @@ rte_table_acl_entry_delete_bulk(
}
/* Commit changes */
- if (acl->ctx != NULL)
- rte_acl_free(acl->ctx);
+ rte_acl_free(acl->ctx);
acl->ctx = ctx;
for (i = 0; i < n_keys; i++) {