commit: 87cf7a326fb2ab7cd780ebd9d14f21ab7fba7ff4
parent f9226fb96d893ff6a4dd4762a74cc0b52bacc1f4
Author: Michael Forney <mforney@mforney.org>
Date: Sun, 7 Jul 2019 19:25:18 -0700
Revert "e2fsprogs: Fix a few function declarations to match definitions"
This reverts commit 1995df90e37b0f9498365d143210e84c178b54a2.
Diffstat:
3 files changed, 1 insertion(+), 48 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -40,7 +40,6 @@
[submodule "pkg/e2fsprogs/src"]
path = pkg/e2fsprogs/src
url = https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git
- ignore = all
[submodule "pkg/efibootmgr/src"]
path = pkg/efibootmgr/src
url = https://github.com/rhinstaller/efibootmgr
diff --git a/pkg/e2fsprogs/patch/0001-Adjust-a-few-function-prototypes-to-match-parameter-.patch b/pkg/e2fsprogs/patch/0001-Adjust-a-few-function-prototypes-to-match-parameter-.patch
@@ -1,46 +0,0 @@
-From 820815508bbe54fd6be4ad4f4f9a24d69c535ab7 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Wed, 19 Jun 2019 18:58:10 -0700
-Subject: [PATCH] Adjust a few function prototypes to match parameter
- qualifiers in definitions
-
-The `const` is not meaningful for function declarations that are not
-definitions, and the definitions don't use it, so just remove it.
-
-Signed-off-by: Michael Forney <mforney@mforney.org>
----
- e2fsck/e2fsck.h | 4 ++--
- lib/blkid/blkidP.h | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h
-index 2d359b38..693ad95b 100644
---- a/e2fsck/e2fsck.h
-+++ b/e2fsck/e2fsck.h
-@@ -625,8 +625,8 @@ extern int inode_has_valid_blocks(struct ext2_inode *inode);
- extern void e2fsck_read_inode(e2fsck_t ctx, unsigned long ino,
- struct ext2_inode * inode, const char * proc);
- extern void e2fsck_read_inode_full(e2fsck_t ctx, unsigned long ino,
-- struct ext2_inode *inode,
-- const int bufsize, const char *proc);
-+ struct ext2_inode *inode, int bufsize,
-+ const char *proc);
- extern void e2fsck_write_inode(e2fsck_t ctx, unsigned long ino,
- struct ext2_inode * inode, const char * proc);
- extern void e2fsck_write_inode_full(e2fsck_t ctx, unsigned long ino,
-diff --git a/lib/blkid/blkidP.h b/lib/blkid/blkidP.h
-index b3fe4a66..816b5344 100644
---- a/lib/blkid/blkidP.h
-+++ b/lib/blkid/blkidP.h
-@@ -108,7 +108,7 @@ struct blkid_struct_cache
- #define BLKID_BIC_FL_CHANGED 0x0004 /* Cache has changed from disk */
-
- extern char *blkid_strdup(const char *s);
--extern char *blkid_strndup(const char *s, const int length);
-+extern char *blkid_strndup(const char *s, int length);
-
- #define BLKID_CACHE_FILE "/etc/blkid.tab"
-
---
-2.20.1
-
diff --git a/pkg/e2fsprogs/ver b/pkg/e2fsprogs/ver
@@ -1 +1 @@
-1.45.2 r1
+1.45.2 r2
