Skip to content

min: Cleaned up usage of MIN in favor of safer CCAN min. #3272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
igaw merged 1 commit into from
Apr 15, 2026
+3 −5
Merged

min: Cleaned up usage of MIN in favor of safer CCAN min. #3272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions libnvme/src/nvme/nbft.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
#include "private.h"
#include "compiler_attributes.h"

#define MIN(a, b) (((a) < (b)) ? (a) : (b))

static __u8 csum(const __u8 *buffer, ssize_t length)
{
int n;
Expand Down
6 changes: 3 additions & 3 deletions libnvme/src/nvme/util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@ static size_t copy_value(char *buf, size_t buflen, const char *value)
/* Remove trailing " */
val_len = strcspn(value, "\"");

memcpy(buf, value, MIN(val_len, buflen-1));
memcpy(buf, value, min(val_len, buflen-1));

return val_len;
}
Expand Down Expand Up @@ -684,7 +684,7 @@ size_t get_entity_version(char *buffer, size_t bufsz)
if (name_len) {
/* Append a space */
buffer[num_bytes++] = ' ';
name_len = MIN(name_len, bufsz);
name_len = min(name_len, bufsz);
memcpy(&buffer[num_bytes], name, name_len);
bufsz -= name_len;
num_bytes += name_len;
Expand All @@ -693,7 +693,7 @@ size_t get_entity_version(char *buffer, size_t bufsz)
if (ver_id_len) {
/* Append a space */
buffer[num_bytes++] = ' ';
ver_id_len = MIN(ver_id_len, bufsz);
ver_id_len = min(ver_id_len, bufsz);
memcpy(&buffer[num_bytes], ver_id, ver_id_len);
bufsz -= ver_id_len;
num_bytes += ver_id_len;
Expand Down
Loading