aboutsummaryrefslogtreecommitdiffstats
path: root/librecrypt_realise_salts.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--librecrypt_realise_salts.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/librecrypt_realise_salts.c b/librecrypt_realise_salts.c
index 3fcce88..195afaf 100644
--- a/librecrypt_realise_salts.c
+++ b/librecrypt_realise_salts.c
@@ -49,7 +49,7 @@ librecrypt_realise_salts(char *restrict out_buffer, size_t size, const char *set
while (nasterisks--) {
/* Copy text before next '*' */
for (i = 0u; settings[i] != '*'; i++);
- min = i < size ? i : size;
+ min = MIN(i, size);
memcpy(out_buffer, settings, min);
out_buffer = &out_buffer[min];
size -= min;
@@ -124,7 +124,7 @@ librecrypt_realise_salts(char *restrict out_buffer, size_t size, const char *set
size -= left;
/* Write padding charaters */
- right = right < size ? right : size;
+ right = MIN(right, size);
for (i = 0u; i < right; i++)
out_buffer[right] = pad; /* $covered$ (TODO we currently don't have an algorithm to trigger this) */
out_buffer = &out_buffer[right];
@@ -135,7 +135,7 @@ librecrypt_realise_salts(char *restrict out_buffer, size_t size, const char *set
for (i = 0u; settings[i];)
if (settings[i++] == LIBRECRYPT_ALGORITHM_LINK_DELIMITER)
break;
- min = i < size ? i : size;
+ min = MIN(i, size);
memcpy(out_buffer, settings, min);
out_buffer = &out_buffer[min];
size -= min;