kernel: avoided increments/decrements with side effects

- moved ++/-- before or after the value use Signed-off-by: frei tycho <[email protected]>
zephyrproject-rtos · Jun 14, 2024 · d817940 · d817940
1 parent a2e9740
commit d817940
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/kernel/include/priority_q.h b/kernel/include/priority_q.h
@@ -79,7 +79,8 @@ static ALWAYS_INLINE void z_priq_rb_add(struct _priq_rb *pq, struct k_thread *th
 {
 	struct k_thread *t;
 
-	thread->base.order_key = pq->next_order_key++;
+	thread->base.order_key = pq->next_order_key;
+	++pq->next_order_key;
 
 	/* Renumber at wraparound.  This is tiny code, and in practice
 	 * will almost never be hit on real systems.  BUT on very
@@ -89,7 +90,8 @@ static ALWAYS_INLINE void z_priq_rb_add(struct _priq_rb *pq, struct k_thread *th
 	 */
 	if (!pq->next_order_key) {
 		RB_FOR_EACH_CONTAINER(&pq->tree, t, base.qnode_rb) {
-			t->base.order_key = pq->next_order_key++;
+			t->base.order_key = pq->next_order_key;
+			++pq->next_order_key;
 		}
 	}
 

diff --git a/kernel/mempool.c b/kernel/mempool.c
@@ -46,7 +46,8 @@ void k_free(void *ptr)
 
 	if (ptr != NULL) {
 		heap_ref = ptr;
-		ptr = --heap_ref;
+		--heap_ref;
+		ptr = heap_ref;
 
 		SYS_PORT_TRACING_OBJ_FUNC_ENTER(k_heap_sys, k_free, *heap_ref, heap_ref);