timer: fix handling of odp_timer_free() return value

odp_timer_free() no longer returns an event. Fix handling of the return value. Also, eliminate one conditional branch dealing with return values from odp_timer_cancel(). Signed-off-by: Jere Leppänen <[email protected]>
JereLeppanen · Sep 30, 2024 · 69d089d · 69d089d
1 parent 973cc05
commit 69d089d
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/src/ofp_timer.c b/src/ofp_timer.c
@@ -479,23 +479,17 @@ int ofp_timer_cancel(odp_timer_t tim)
 		return -1;
 	}
 	else {
-		if (odp_timer_cancel(tim, &timeout_event) < 0)
-		{
-			OFP_WARN("Timeout already expired or inactive");
-			return 0;
-		}
-
-		if (timeout_event != ODP_EVENT_INVALID) {
+		if (odp_timer_cancel(tim, &timeout_event) == ODP_TIMER_SUCCESS) {
 			tmo = odp_timeout_from_event(timeout_event);
 			bufdata = odp_timeout_user_ptr(tmo);
 			odp_buffer_free(bufdata->buf);
 			odp_timeout_free(tmo);
 		} else {
-			OFP_WARN("Lost timeout buffer at timer cancel");
+			OFP_WARN("odp_timer_cancel failed");
 			return -1;
 		}
 
-		if (odp_timer_free(tim) != ODP_EVENT_INVALID) {
+		if (odp_timer_free(tim)) {
 			OFP_ERR("odp_timer_free failed");
 			return -1;
 		}