averello/oasis-linux-mirror
1
0
Fork 0
mirror of https://github.com/oasislinux/oasis.git synced 2026-05-03 12:25:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
master
oasis-linux-mirror/pkg/util-linux/patch/0004-Avoid-statement-expressions-min-max.patch
T
Michael Forney 18ca169d2c util-linux: Update to 2.41.3 
Also, switch to tar archive for pre-generated man pages.
2026-03-12 23:47:05 -07:00

345 lines
12 KiB
Diff
Raw Permalink Blame History

From 965ca8368f78249ab7e64e4b7686e6b0d7d77084 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Tue, 12 Mar 2019 17:13:45 -0700
Subject: [PATCH] Avoid statement expressions min/max
---
include/c.h | 24 ++++++++++--------------
include/strutils.h | 3 ++-
lib/mbsalign.c | 2 +-
lib/sysfs.c | 4 ++--
libblkid/src/probe.c | 4 ++--
libblkid/src/superblocks/befs.c | 6 +++---
libblkid/src/superblocks/exfat.c | 2 +-
libblkid/src/superblocks/iso9660.c | 4 ++--
libblkid/src/superblocks/minix.c | 4 ++--
libblkid/src/superblocks/romfs.c | 2 +-
libfdisk/src/alignment.c | 8 ++++----
libfdisk/src/context.c | 4 ++--
libfdisk/src/gpt.c | 4 ++--
libsmartcols/src/calculate.c | 6 +++---
libsmartcols/src/column.c | 7 ++++---
15 files changed, 41 insertions(+), 43 deletions(-)
diff --git a/include/c.h b/include/c.h
index 3ba42306c..1ba8c2beb 100644
--- a/include/c.h
+++ b/include/c.h
@@ -145,21 +145,17 @@
# define FALSE 0
#endif
-#ifndef min
-# define min(x, y) __extension__ ({ \
- __typeof__(x) _min1 = (x); \
- __typeof__(y) _min2 = (y); \
- (void) (&_min1 == &_min2); \
- _min1 < _min2 ? _min1 : _min2; })
-#endif
+static inline uintmax_t
+umax(uintmax_t x, uintmax_t y)
+{
+ return x > y ? x : y;
+}
-#ifndef max
-# define max(x, y) __extension__ ({ \
- __typeof__(x) _max1 = (x); \
- __typeof__(y) _max2 = (y); \
- (void) (&_max1 == &_max2); \
- _max1 > _max2 ? _max1 : _max2; })
-#endif
+static inline uintmax_t
+umin(uintmax_t x, uintmax_t y)
+{
+ return x < y ? x : y;
+}
#ifndef abs_diff
# define abs_diff(x, y) __extension__ ({ \
diff --git a/include/strutils.h b/include/strutils.h
index a7177fc23..273aaedb8 100644
--- a/include/strutils.h
+++ b/include/strutils.h
@@ -90,7 +90,8 @@ static inline int xstrncpy(char *dest, const char *src, size_t n)
if (!len)
return 0;
- len = min(len, n - 1);
+ if (n - 1 < len)
+ len = n - 1;
memcpy(dest, src, len);
dest[len] = 0;
return len;
diff --git a/lib/mbsalign.c b/lib/mbsalign.c
index b4ab7becd..ea531119b 100644
--- a/lib/mbsalign.c
+++ b/lib/mbsalign.c
@@ -629,7 +629,7 @@ mbsalign_unibyte:
dest = mbs_align_pad (dest, dest_end, start_spaces, padchar);
space_left = dest_end - dest;
- dest = mempcpy (dest, str_to_print, min (n_used_bytes, space_left));
+ dest = mempcpy (dest, str_to_print, umin (n_used_bytes, space_left));
mbs_align_pad (dest, dest_end, end_spaces, padchar);
}
#ifdef HAVE_WIDECHAR
diff --git a/lib/sysfs.c b/lib/sysfs.c
index c888617b7..7ecfdc9a8 100644
--- a/lib/sysfs.c
+++ b/lib/sysfs.c
@@ -479,9 +479,9 @@ static int sysfs_devchain_is_removable(char *chain)
close(fd);
if (rc > 0) {
- if (strncmp(buf, "fixed", min(rc, 5)) == 0) {
+ if (strncmp(buf, "fixed", umin(rc, 5)) == 0) {
return 0;
- } else if (strncmp(buf, "removable", min(rc, 9)) == 0) {
+ } else if (strncmp(buf, "removable", umin(rc, 9)) == 0) {
return 1;
}
}
diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c
index a38f5990e..8aea0cd5f 100644
--- a/libblkid/src/probe.c
+++ b/libblkid/src/probe.c
@@ -1021,7 +1021,7 @@ static uint64_t blkid_get_io_size(int fd)
for (i = 0; i < ARRAY_SIZE(ioctls); i++) {
r = ioctl(fd, ioctls[i], &s);
if (r == 0 && is_power_of_2(s) && s >= DEFAULT_SECTOR_SIZE)
- return min(s, 1U << 16);
+ return umin(s, 1U << 16);
}
return DEFAULT_SECTOR_SIZE;
@@ -2009,7 +2009,7 @@ static void blkid_probe_log_csum_mismatch(blkid_probe pr, size_t n, const void *
{
char csum_hex[256];
char expected_hex[sizeof(csum_hex)];
- int hex_size = min(sizeof(csum_hex), n * 2);
+ int hex_size = umin(sizeof(csum_hex), n * 2);
for (int i = 0; i < hex_size; i+=2) {
snprintf(&csum_hex[i], sizeof(csum_hex) - i, "%02X", ((const unsigned char *) csum)[i / 2]);
diff --git a/libblkid/src/superblocks/befs.c b/libblkid/src/superblocks/befs.c
index 5d082a949..322118601 100644
--- a/libblkid/src/superblocks/befs.c
+++ b/libblkid/src/superblocks/befs.c
@@ -264,7 +264,7 @@ static int32_t compare_keys(const char keys1[], uint16_t keylengths1[],
key1 = &keys1[keystart1];
- result = strncmp(key1, key2, min(keylength1, keylength2));
+ result = strncmp(key1, key2, umin(keylength1, keylength2));
if (result == 0)
return keylength1 - keylength2;
@@ -393,8 +393,8 @@ static int get_uuid(blkid_probe pr, const struct befs_super_block *bs,
bi_size = (uint64_t)FS16_TO_CPU(bs->root_dir.len, fs_le) <<
FS32_TO_CPU(bs->block_shift, fs_le);
- sd_total_size = min(bi_size - sizeof(struct befs_inode),
- (uint64_t)FS32_TO_CPU(bi->inode_size, fs_le));
+ sd_total_size = umin(bi_size - sizeof(struct befs_inode),
+ (uint64_t)FS32_TO_CPU(bi->inode_size, fs_le));
offset = 0;
diff --git a/libblkid/src/superblocks/exfat.c b/libblkid/src/superblocks/exfat.c
index a7d3e0298..a67e6f5e0 100644
--- a/libblkid/src/superblocks/exfat.c
+++ b/libblkid/src/superblocks/exfat.c
@@ -259,7 +259,7 @@ static int probe_exfat(blkid_probe pr, const struct blkid_idmag *mag)
label = find_label(pr, sb);
if (label)
blkid_probe_set_utf8label(pr, label->name,
- min((size_t) label->length * 2, sizeof(label->name)),
+ umin((size_t) label->length * 2, sizeof(label->name)),
UL_ENCODE_UTF16LE);
else if (errno)
return -errno;
diff --git a/libblkid/src/superblocks/iso9660.c b/libblkid/src/superblocks/iso9660.c
index a7a364f30..6567dc519 100644
--- a/libblkid/src/superblocks/iso9660.c
+++ b/libblkid/src/superblocks/iso9660.c
@@ -257,8 +257,8 @@ static int probe_iso9660(blkid_probe pr, const struct blkid_idmag *mag)
const unsigned char *desc =
blkid_probe_get_buffer(pr,
off + (is_hs ? 8 : 0), /* High Sierra has 8 bytes before descriptor with Volume Descriptor LBN value */
- max(sizeof(struct boot_record),
- sizeof(struct iso_volume_descriptor)));
+ umax(sizeof(struct boot_record),
+ sizeof(struct iso_volume_descriptor)));
if (desc == NULL || desc[0] == ISO_VD_END)
break;
diff --git a/libblkid/src/superblocks/minix.c b/libblkid/src/superblocks/minix.c
index dba299d23..b18bcf89e 100644
--- a/libblkid/src/superblocks/minix.c
+++ b/libblkid/src/superblocks/minix.c
@@ -83,8 +83,8 @@ static int probe_minix(blkid_probe pr,
unsigned block_size;
data = blkid_probe_get_buffer(pr, 1024,
- max(sizeof(struct minix_super_block),
- sizeof(struct minix3_super_block)));
+ umax(sizeof(struct minix_super_block),
+ sizeof(struct minix3_super_block)));
if (!data)
return errno ? -errno : 1;
version = get_minix_version(data, &swabme);
diff --git a/libblkid/src/superblocks/romfs.c b/libblkid/src/superblocks/romfs.c
index 86c09adc3..ac2f0ba78 100644
--- a/libblkid/src/superblocks/romfs.c
+++ b/libblkid/src/superblocks/romfs.c
@@ -27,7 +27,7 @@ struct romfs_super_block {
static int romfs_verify_csum(blkid_probe pr, const struct blkid_idmag *mag,
const struct romfs_super_block *ros)
{
- uint32_t csummed_size = min((uint32_t) 512,
+ uint32_t csummed_size = umin((uint32_t) 512,
be32_to_cpu(ros->ros_full_size));
const unsigned char *csummed;
uint32_t csum;
diff --git a/libfdisk/src/alignment.c b/libfdisk/src/alignment.c
index 2c7a00486..6fc1b9b9d 100644
--- a/libfdisk/src/alignment.c
+++ b/libfdisk/src/alignment.c
@@ -38,7 +38,7 @@
*/
static int lba_is_aligned(struct fdisk_context *cxt, uintmax_t lba)
{
- unsigned long granularity = max(cxt->phy_sector_size, cxt->min_io_size);
+ unsigned long granularity = umax(cxt->phy_sector_size, cxt->min_io_size);
uintmax_t offset;
if (cxt->grain > granularity)
@@ -54,7 +54,7 @@ static int lba_is_aligned(struct fdisk_context *cxt, uintmax_t lba)
*/
static int lba_is_phy_aligned(struct fdisk_context *cxt, fdisk_sector_t lba)
{
- unsigned long granularity = max(cxt->phy_sector_size, cxt->min_io_size);
+ unsigned long granularity = umax(cxt->phy_sector_size, cxt->min_io_size);
uintmax_t offset = (lba * cxt->sector_size) % granularity;
return !((granularity + cxt->alignment_offset - offset) % granularity);
@@ -103,7 +103,7 @@ fdisk_sector_t fdisk_align_lba(struct fdisk_context *cxt, fdisk_sector_t lba, in
* according the offset to be on the physical boundary.
*/
/* fprintf(stderr, "LBA: %llu apply alignment_offset\n", res); */
- res -= (max(cxt->phy_sector_size, cxt->min_io_size) -
+ res -= (umax(cxt->phy_sector_size, cxt->min_io_size) -
cxt->alignment_offset) / cxt->sector_size;
if (direction == FDISK_ALIGN_UP && res < lba)
@@ -405,7 +405,7 @@ int fdisk_apply_user_device_properties(struct fdisk_context *cxt)
return rc;
if (cxt->user_grain) {
- unsigned long granularity = max(cxt->phy_sector_size, cxt->min_io_size);
+ unsigned long granularity = umax(cxt->phy_sector_size, cxt->min_io_size);
cxt->grain = cxt->user_grain < granularity ? granularity : cxt->user_grain;
DBG(CXT, ul_debugobj(cxt, "new grain: %lu", cxt->grain));
diff --git a/libfdisk/src/context.c b/libfdisk/src/context.c
index 3b2a4d25f..b1363bbd9 100644
--- a/libfdisk/src/context.c
+++ b/libfdisk/src/context.c
@@ -920,7 +920,7 @@ int fdisk_reread_changes(struct fdisk_context *cxt, struct fdisk_table *org)
/* the current layout */
fdisk_get_partitions(cxt, &tb);
/* maximal number of partitions */
- nparts = max(fdisk_table_get_nents(tb), fdisk_table_get_nents(org));
+ nparts = umax(fdisk_table_get_nents(tb), fdisk_table_get_nents(org));
while (fdisk_diff_tables(org, tb, &itr, &pa, &change) == 0) {
if (change == FDISK_DIFF_UNCHANGED)
@@ -977,7 +977,7 @@ int fdisk_reread_changes(struct fdisk_context *cxt, struct fdisk_table *org)
/* Let's follow the Linux kernel and reduce
* DOS extended partition to 1 or 2 sectors.
*/
- sz = min(sz, (uint64_t) 2);
+ sz = umin(sz, (uint64_t) 2);
if (partx_add_partition(cxt->dev_fd, pa->partno + 1,
pa->start * ssf, sz) != 0) {
diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c
index 85040fb6b..76a6ab65b 100644
--- a/libfdisk/src/gpt.c
+++ b/libfdisk/src/gpt.c
@@ -506,7 +506,7 @@ static int gpt_mknew_pmbr(struct fdisk_context *cxt)
pmbr->partition_record[0].end_track = 0xFF;
pmbr->partition_record[0].starting_lba = cpu_to_le32(1);
pmbr->partition_record[0].size_in_lba =
- cpu_to_le32((uint32_t) min( cxt->total_sectors - 1ULL, 0xFFFFFFFFULL) );
+ cpu_to_le32((uint32_t) umin(cxt->total_sectors - 1ULL, 0xFFFFFFFFULL));
return 0;
}
@@ -958,7 +958,7 @@ static int valid_pmbr(struct fdisk_context *cxt)
/* Note that gpt_write_pmbr() overwrites PMBR, but we want to keep it valid already
* in memory too to disable warnings when valid_pmbr() called next time */
pmbr->partition_record[part].size_in_lba =
- cpu_to_le32((uint32_t) min( cxt->total_sectors - 1ULL, 0xFFFFFFFFULL) );
+ cpu_to_le32((uint32_t) umin(cxt->total_sectors - 1ULL, 0xFFFFFFFFULL));
fdisk_label_set_changed(cxt->label, 1);
}
}
diff --git a/libsmartcols/src/calculate.c b/libsmartcols/src/calculate.c
index 77e843397..d0e892187 100644
--- a/libsmartcols/src/calculate.c
+++ b/libsmartcols/src/calculate.c
@@ -66,11 +66,11 @@ static int count_cell_width(struct libscols_table *tb,
if (scols_column_is_tree(cl)) {
size_t treewidth = ul_buffer_get_safe_pointer_width(buf, SCOLS_BUFPTR_TREEEND);
- cl->width_treeart = max(cl->width_treeart, treewidth);
+ cl->width_treeart = umax(cl->width_treeart, treewidth);
}
ce->width = len;
- cl->wstat.width_max = max(len, cl->wstat.width_max);
+ cl->wstat.width_max = umax(len, cl->wstat.width_max);
done:
scols_table_reset_cursor(tb);
return rc;
@@ -178,7 +178,7 @@ static int count_column_width(struct libscols_table *tb,
size_t len = scols_table_is_noencoding(tb) ?
mbs_width(data) : mbs_safe_width(data);
- st->width_min = max(st->width_min, len);
+ st->width_min = umax(st->width_min, len);
} else
no_header = 1;
diff --git a/libsmartcols/src/column.c b/libsmartcols/src/column.c
index e83d297fc..151adcfe0 100644
--- a/libsmartcols/src/column.c
+++ b/libsmartcols/src/column.c
@@ -574,7 +574,7 @@ size_t scols_wrapnl_chunksize(const struct libscols_column *cl __attribute__((un
mbs_width(data) :
mbs_safe_width(data);
}
- sum = max(sum, sz);
+ sum = umax(sum, sz);
data = p;
}
@@ -1068,9 +1068,10 @@ int scols_column_greatest_wrap(
while (scols_column_next_wrap(cl, ce, data) == 0) {
size_t sz = strlen(*data);
- maxsz = max(maxsz, sz);
- if (maxsz == sz)
+ if (maxsz <= sz) {
+ maxsz = sz;
res = *data;
+ }
}
*data = res;
--
2.49.0
Reference in New Issue View Git Blame Copy Permalink