git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove unneeded tests for NULL when freeing
[dpdk.git]
/
app
/
test
/
test_ring.c
diff --git
a/app/test/test_ring.c
b/app/test/test_ring.c
index
2cd8e77
..
943c350
100644
(file)
--- a/
app/test/test_ring.c
+++ b/
app/test/test_ring.c
@@
-46,7
+46,6
@@
#include <rte_memzone.h>
#include <rte_launch.h>
#include <rte_cycles.h>
#include <rte_memzone.h>
#include <rte_launch.h>
#include <rte_cycles.h>
-#include <rte_tailq.h>
#include <rte_eal.h>
#include <rte_per_lcore.h>
#include <rte_lcore.h>
#include <rte_eal.h>
#include <rte_per_lcore.h>
#include <rte_lcore.h>
@@
-472,17
+471,13
@@
test_ring_basic(void)
if (ret != 0)
goto fail;
if (ret != 0)
goto fail;
- if (src)
- free(src);
- if (dst)
- free(dst);
+ free(src);
+ free(dst);
return 0;
fail:
return 0;
fail:
- if (src)
- free(src);
- if (dst)
- free(dst);
+ free(src);
+ free(dst);
return -1;
}
return -1;
}
@@
-760,17
+755,13
@@
test_ring_burst_basic(void)
goto fail;
/* Free memory before test completed */
goto fail;
/* Free memory before test completed */
- if (src)
- free(src);
- if (dst)
- free(dst);
+ free(src);
+ free(dst);
return 0;
fail:
return 0;
fail:
- if (src)
- free(src);
- if (dst)
- free(dst);
+ free(src);
+ free(dst);
return -1;
}
return -1;
}
@@
-1169,17
+1160,13
@@
test_ring_stats(void)
memset(&r->stats[lcore_id], 0, sizeof(r->stats[lcore_id]));
/* Free memory before test completed */
memset(&r->stats[lcore_id], 0, sizeof(r->stats[lcore_id]));
/* Free memory before test completed */
- if (src)
- free(src);
- if (dst)
- free(dst);
+ free(src);
+ free(dst);
return 0;
fail:
return 0;
fail:
- if (src)
- free(src);
- if (dst)
- free(dst);
+ free(src);
+ free(dst);
return -1;
#endif
}
return -1;
#endif
}
@@
-1259,7
+1246,7
@@
test_ring_basic_ex(void)
struct rte_ring * rp;
void **obj = NULL;
struct rte_ring * rp;
void **obj = NULL;
- obj =
(void **)rte_zmalloc("test_ring_basic_ex_malloc", (RING_SIZE * sizeof(void *)
), 0);
+ obj =
rte_calloc("test_ring_basic_ex_malloc", RING_SIZE, sizeof(void *
), 0);
if (obj == NULL) {
printf("test_ring_basic_ex fail to rte_malloc\n");
goto fail_test;
if (obj == NULL) {
printf("test_ring_basic_ex fail to rte_malloc\n");
goto fail_test;