commit: cd0ea7fe25b1bad4d5685e6d47d0ea5d79fefd6c
parent 6b03d019ddc6da1b92b512627f4d1513ca2cb13e
Author: Michael Forney <mforney@mforney.org>
Date: Fri, 5 Jun 2020 01:31:50 -0700
e2fsprogs: Fix/disable some warnings
Diffstat:
4 files changed, 73 insertions(+), 1 deletion(-)
diff --git a/pkg/e2fsprogs/gen.lua b/pkg/e2fsprogs/gen.lua
@@ -1,5 +1,8 @@
set('version', '1.45.6')
cflags{
+ '-std=c99', '-Wall',
+ '-Wno-address-of-packed-member', '-Wno-format-truncation', '-Wno-format-overflow',
+ '-Wno-pointer-sign', '-Wno-maybe-uninitialized',
'-D HAVE_CONFIG_H',
'-I $outdir',
'-I $outdir/include',
diff --git a/pkg/e2fsprogs/patch/0002-Fix-format-specifier-in-error-message.patch b/pkg/e2fsprogs/patch/0002-Fix-format-specifier-in-error-message.patch
@@ -0,0 +1,25 @@
+From b346ce6f199dccc18caf26d25473f1841c51007d Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Fri, 5 Jun 2020 01:27:30 -0700
+Subject: [PATCH] Fix format specifier in error message
+
+---
+ e2fsck/util.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/e2fsck/util.c b/e2fsck/util.c
+index d98b8e47..b0e01cc9 100644
+--- a/e2fsck/util.c
++++ b/e2fsck/util.c
+@@ -126,7 +126,7 @@ void *e2fsck_allocate_memory(e2fsck_t ctx, unsigned long size,
+ printf("Allocating %u bytes for %s...\n", size, description);
+ #endif
+ if (ext2fs_get_memzero(size, &ret)) {
+- sprintf(buf, "Can't allocate %u bytes for %s\n",
++ sprintf(buf, "Can't allocate %lu bytes for %s\n",
+ size, description);
+ fatal_error(ctx, buf);
+ }
+--
+2.27.0
+
diff --git a/pkg/e2fsprogs/patch/0003-Remove-unused-variables.patch b/pkg/e2fsprogs/patch/0003-Remove-unused-variables.patch
@@ -0,0 +1,44 @@
+From 6276beeab62b8dc949b8179f64738ea4958e4870 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Fri, 5 Jun 2020 01:29:07 -0700
+Subject: [PATCH] Remove unused variables
+
+---
+ e2fsck/rehash.c | 2 +-
+ lib/ext2fs/swapfs.c | 3 +--
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/e2fsck/rehash.c b/e2fsck/rehash.c
+index 1616d07a..b356b92d 100644
+--- a/e2fsck/rehash.c
++++ b/e2fsck/rehash.c
+@@ -109,7 +109,7 @@ static int fill_dir_block(ext2_filsys fs,
+ void *priv_data)
+ {
+ struct fill_dir_struct *fd = (struct fill_dir_struct *) priv_data;
+- struct hash_entry *new_array, *ent;
++ struct hash_entry *ent;
+ struct ext2_dir_entry *dirent;
+ char *dir;
+ unsigned int offset, dir_offset, rec_len, name_len;
+diff --git a/lib/ext2fs/swapfs.c b/lib/ext2fs/swapfs.c
+index a3d5d16a..56e10c36 100644
+--- a/lib/ext2fs/swapfs.c
++++ b/lib/ext2fs/swapfs.c
+@@ -456,12 +456,11 @@ errcode_t ext2fs_dirent_swab_out2(ext2_filsys fs, char *buf,
+ {
+ errcode_t retval;
+ char *p, *end;
+- unsigned int rec_len, left;
++ unsigned int rec_len;
+ struct ext2_dir_entry *dirent;
+
+ p = buf;
+ end = buf + size;
+- left = size;
+ while (p < end) {
+ dirent = (struct ext2_dir_entry *) p;
+ retval = ext2fs_get_rec_len(fs, dirent, &rec_len);
+--
+2.27.0
+
diff --git a/pkg/e2fsprogs/ver b/pkg/e2fsprogs/ver
@@ -1 +1 @@
-1.45.6 r1
+1.45.6 r2
