safe clipclip(int v, int minv, int maxv) : swap(minv, maxv) when (min…

…v>maxv)
gitgjogh · Feb 9, 2016 · e10519f · e10519f
1 parent 8213286
commit e10519f
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/libsim/sim_utils.c b/libsim/sim_utils.c
@@ -87,9 +87,12 @@ int num_leading_zero_bits_u32(uint32_t val)
 
 int clip(int v, int minv, int maxv)
 {
-    v = (v<minv) ? minv : v;
-    v = (v>maxv) ? maxv : v;
-    return v;
+    if (minv > maxv) 
+        mem_swap(&minv, &maxv, sizeof(int), 1);
+
+    if      (v < minv) return minv;
+    else if (v > maxv) return maxv;
+    else               return v;
 }
 
 /**