diff options
Diffstat (limited to 'pkg/util-linux/patch/0005-Avoid-statement-expressions-min-max.patch')
| -rw-r--r-- | pkg/util-linux/patch/0005-Avoid-statement-expressions-min-max.patch | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/pkg/util-linux/patch/0005-Avoid-statement-expressions-min-max.patch b/pkg/util-linux/patch/0005-Avoid-statement-expressions-min-max.patch index 3cc6d0cb..0e9a9342 100644 --- a/pkg/util-linux/patch/0005-Avoid-statement-expressions-min-max.patch +++ b/pkg/util-linux/patch/0005-Avoid-statement-expressions-min-max.patch @@ -1,4 +1,4 @@ -From 3e9baf3101f85cd288d6bbcbfc75c2e8d6a49e7e Mon Sep 17 00:00:00 2001 +From 6bd00097ea010f4ead414f740e0b180dacdfc7bf 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 @@ -14,7 +14,7 @@ Subject: [PATCH] Avoid statement expressions min/max 7 files changed, 23 insertions(+), 27 deletions(-) diff --git a/include/c.h b/include/c.h -index 7f3a8b173..7201b18af 100644 +index 62fcfe2d0..3c54d57f4 100644 --- a/include/c.h +++ b/include/c.h @@ -126,21 +126,17 @@ @@ -50,10 +50,10 @@ index 7f3a8b173..7201b18af 100644 #ifndef cmp_numbers # define cmp_numbers(x, y) __extension__ ({ \ diff --git a/lib/mbsalign.c b/lib/mbsalign.c -index 8fdab9ee9..bb31e7583 100644 +index e251202af..f3ea1a2df 100644 --- a/lib/mbsalign.c +++ b/lib/mbsalign.c -@@ -563,7 +563,7 @@ mbsalign_unibyte: +@@ -614,7 +614,7 @@ mbsalign_unibyte: dest = mbs_align_pad (dest, dest_end, start_spaces, padchar); space_left = dest_end - dest; @@ -63,7 +63,7 @@ index 8fdab9ee9..bb31e7583 100644 } #ifdef HAVE_WIDECHAR diff --git a/libfdisk/src/alignment.c b/libfdisk/src/alignment.c -index 4ae5ff08f..931ec8b9a 100644 +index 3d0254634..91f6d1f7d 100644 --- a/libfdisk/src/alignment.c +++ b/libfdisk/src/alignment.c @@ -38,7 +38,7 @@ @@ -93,7 +93,7 @@ index 4ae5ff08f..931ec8b9a 100644 cxt->alignment_offset) / cxt->sector_size; if (direction == FDISK_ALIGN_UP && res < lba) -@@ -396,7 +396,7 @@ int fdisk_apply_user_device_properties(struct fdisk_context *cxt) +@@ -398,7 +398,7 @@ int fdisk_apply_user_device_properties(struct fdisk_context *cxt) fdisk_reset_alignment(cxt); if (cxt->user_grain) { @@ -103,10 +103,10 @@ index 4ae5ff08f..931ec8b9a 100644 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 5c9d8aabc..88d83530f 100644 +index 363db30f4..85f68d816 100644 --- a/libfdisk/src/context.c +++ b/libfdisk/src/context.c -@@ -891,7 +891,7 @@ int fdisk_reread_changes(struct fdisk_context *cxt, struct fdisk_table *org) +@@ -893,7 +893,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 */ @@ -116,10 +116,10 @@ index 5c9d8aabc..88d83530f 100644 while (fdisk_diff_tables(org, tb, &itr, &pa, &change) == 0) { if (change == FDISK_DIFF_UNCHANGED) diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c -index a2a346faa..54984bf32 100644 +index dbd240617..ac7515630 100644 --- a/libfdisk/src/gpt.c +++ b/libfdisk/src/gpt.c -@@ -421,7 +421,7 @@ static int gpt_mknew_pmbr(struct fdisk_context *cxt) +@@ -496,7 +496,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 = @@ -128,7 +128,7 @@ index a2a346faa..54984bf32 100644 return 0; } -@@ -770,7 +770,7 @@ static int valid_pmbr(struct fdisk_context *cxt) +@@ -923,7 +923,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 = @@ -138,10 +138,10 @@ index a2a346faa..54984bf32 100644 } } diff --git a/libsmartcols/src/calculate.c b/libsmartcols/src/calculate.c -index a0c0dc4b9..ad48f619c 100644 +index b6137fd23..ed6e8dd25 100644 --- a/libsmartcols/src/calculate.c +++ b/libsmartcols/src/calculate.c -@@ -55,7 +55,7 @@ static int count_cell_width(struct libscols_table *tb, +@@ -57,7 +57,7 @@ static int count_cell_width(struct libscols_table *tb, if (len == (size_t) -1) /* ignore broken multibyte strings */ len = 0; @@ -150,7 +150,7 @@ index a0c0dc4b9..ad48f619c 100644 if (cl->is_extreme && cl->width_avg && len > cl->width_avg * 2) return 0; -@@ -64,10 +64,10 @@ static int count_cell_width(struct libscols_table *tb, +@@ -66,10 +66,10 @@ static int count_cell_width(struct libscols_table *tb, cl->extreme_sum += len; cl->extreme_count++; } @@ -163,28 +163,28 @@ index a0c0dc4b9..ad48f619c 100644 } return 0; } -@@ -108,7 +108,7 @@ static int count_column_width(struct libscols_table *tb, - } - if (scols_cell_get_data(&cl->header)) { - size_t len = mbs_safe_width(scols_cell_get_data(&cl->header)); +@@ -115,7 +115,7 @@ static int count_column_width(struct libscols_table *tb, + if (data) { + size_t len = scols_table_is_noencoding(tb) ? + mbs_width(data) : mbs_safe_width(data); - cl->width_min = max(cl->width_min, len); + cl->width_min = umax(cl->width_min, len); } else no_header = 1; diff --git a/libsmartcols/src/column.c b/libsmartcols/src/column.c -index 4b42938f6..81fe76000 100644 +index c11df69f5..1285d42e6 100644 --- a/libsmartcols/src/column.c +++ b/libsmartcols/src/column.c -@@ -343,7 +343,7 @@ size_t scols_wrapnl_chunksize(const struct libscols_column *cl __attribute__((un - } else - sz = mbs_safe_width(data); - +@@ -347,7 +347,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; } -- -2.26.2 +2.28.0 |