use Py_MIN

flexatone · flexatone · commit 402574265493 · 2023-04-10T12:00:09.000-07:00
diff --git a/automap.c b/automap.c
@@ -913,7 +913,7 @@ lookup_hash_unicode(
             }
             p_start = (Py_UCS4*)PyArray_GETPTR1(a, table[table_pos].keys_pos);
             // memcmp returns 0 on match
-            if (!memcmp(p_start, key, (key_size < dt_size ? key_size : dt_size))) {
+            if (!memcmp(p_start, key, Py_MIN(key_size, dt_size))) {
                 return table_pos;
             }
             table_pos++;
@@ -954,7 +954,7 @@ lookup_hash_string(
             }
             p_start = (char*)PyArray_GETPTR1(a, table[table_pos].keys_pos);
             // memcmp returns 0 on match
-            if (!memcmp(p_start, key, (key_size < dt_size ? key_size : dt_size))) {
+            if (!memcmp(p_start, key, Py_MIN(key_size, dt_size))) {
                 return table_pos;
             }
             table_pos++;

Original file line number	Diff line number	Diff line change
`@@ -913,7 +913,7 @@ lookup_hash_unicode(`
`913`	`913`	`}`
`914`	`914`	`p_start = (Py_UCS4*)PyArray_GETPTR1(a, table[table_pos].keys_pos);`
`915`	`915`	`// memcmp returns 0 on match`
`916`		`- if (!memcmp(p_start, key, (key_size < dt_size ? key_size : dt_size))) {`
	`916`	`+ if (!memcmp(p_start, key, Py_MIN(key_size, dt_size))) {`
`917`	`917`	`return table_pos;`
`918`	`918`	`}`
`919`	`919`	`table_pos++;`
`@@ -954,7 +954,7 @@ lookup_hash_string(`
`954`	`954`	`}`
`955`	`955`	`p_start = (char*)PyArray_GETPTR1(a, table[table_pos].keys_pos);`
`956`	`956`	`// memcmp returns 0 on match`
`957`		`- if (!memcmp(p_start, key, (key_size < dt_size ? key_size : dt_size))) {`
	`957`	`+ if (!memcmp(p_start, key, Py_MIN(key_size, dt_size))) {`
`958`	`958`	`return table_pos;`
`959`	`959`	`}`
`960`	`960`	`table_pos++;`