Skip to content

Commit 43ab10c

Browse files
Change returning 'invalid arg' status to asserting params
in internal memspace and memtarget functions.
1 parent a2d9998 commit 43ab10c

File tree

2 files changed

+14
-19
lines changed

2 files changed

+14
-19
lines changed

src/memspace.c

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,8 @@ static int propertyCmp(const void *a, const void *b) {
204204

205205
umf_result_t umfMemspaceSortDesc(umf_memspace_handle_t hMemspace,
206206
umfGetPropertyFn getProperty) {
207-
if (!hMemspace || !getProperty) {
208-
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
209-
}
207+
assert(hMemspace);
208+
assert(getProperty);
210209

211210
struct memtarget_sort_entry *entries = umf_ba_global_alloc(
212211
sizeof(struct memtarget_sort_entry) * hMemspace->size);
@@ -241,9 +240,8 @@ umf_result_t umfMemspaceSortDesc(umf_memspace_handle_t hMemspace,
241240
umf_result_t umfMemspaceFilter(umf_const_memspace_handle_t hMemspace,
242241
umfGetTargetFn getTarget,
243242
umf_memspace_handle_t *filteredMemspace) {
244-
if (!hMemspace || !getTarget) {
245-
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
246-
}
243+
assert(hMemspace);
244+
assert(getTarget);
247245

248246
umf_memtarget_handle_t *uniqueBestNodes =
249247
umf_ba_global_alloc(hMemspace->size * sizeof(*uniqueBestNodes));
@@ -433,10 +431,8 @@ umfMemspaceMemtargetRemove(umf_memspace_handle_t hMemspace,
433431
static int umfMemspaceFilterHelper(umf_memspace_handle_t memspace,
434432
umf_memspace_filter_func_t filter,
435433
void *args) {
436-
437-
if (!memspace || !filter) {
438-
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
439-
}
434+
assert(memspace);
435+
assert(filter);
440436

441437
size_t idx = 0;
442438
int ret;

src/memtarget.c

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@
2020
umf_result_t umfMemtargetCreate(const umf_memtarget_ops_t *ops, void *params,
2121
umf_memtarget_handle_t *memoryTarget) {
2222
libumfInit();
23-
if (!ops || !memoryTarget) {
24-
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
25-
}
23+
assert(ops);
24+
assert(memoryTarget);
2625

2726
umf_memtarget_handle_t target =
2827
umf_ba_global_alloc(sizeof(umf_memtarget_t));
@@ -93,9 +92,9 @@ umf_result_t umfMemtargetGetCapacity(umf_const_memtarget_handle_t memoryTarget,
9392
umf_result_t umfMemtargetGetBandwidth(umf_memtarget_handle_t srcMemoryTarget,
9493
umf_memtarget_handle_t dstMemoryTarget,
9594
size_t *bandwidth) {
96-
if (!srcMemoryTarget || !dstMemoryTarget || !bandwidth) {
97-
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
98-
}
95+
assert(srcMemoryTarget);
96+
assert(dstMemoryTarget);
97+
assert(bandwidth);
9998

10099
return srcMemoryTarget->ops->get_bandwidth(
101100
srcMemoryTarget->priv, dstMemoryTarget->priv, bandwidth);
@@ -104,9 +103,9 @@ umf_result_t umfMemtargetGetBandwidth(umf_memtarget_handle_t srcMemoryTarget,
104103
umf_result_t umfMemtargetGetLatency(umf_memtarget_handle_t srcMemoryTarget,
105104
umf_memtarget_handle_t dstMemoryTarget,
106105
size_t *latency) {
107-
if (!srcMemoryTarget || !dstMemoryTarget || !latency) {
108-
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
109-
}
106+
assert(srcMemoryTarget);
107+
assert(dstMemoryTarget);
108+
assert(latency);
110109

111110
return srcMemoryTarget->ops->get_latency(srcMemoryTarget->priv,
112111
dstMemoryTarget->priv, latency);

0 commit comments

Comments
 (0)