[Drbd-dev] [PATCH drbd-utils] Fix conflicting declarations of my_parse()
Apollon Oikonomopoulos
apoikos at debian.org
Wed May 28 09:24:29 CEST 2014
my_parse() is declared as void in drbdadm_parser.c, but as int in
drbdadm_main.c. Since the return value is never used, we change the
latter to void. See also Debian bug #749441[1].
[1] https://bugs.debian.org/749441
Reported-by: Michael Tautschnig <mt at debian.org>
Signed-off-by: Apollon Oikonomopoulos <apoikos at debian.org>
---
user/drbdadm_main.c | 2 +-
user/legacy-84/drbdadm_main.c | 2 +-
user/legacy/drbdadm_main.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/user/drbdadm_main.c b/user/drbdadm_main.c
index b974b02..fb72a40 100644
--- a/user/drbdadm_main.c
+++ b/user/drbdadm_main.c
@@ -83,7 +83,7 @@ struct option general_admopt[] = {
};
struct option *admopt = general_admopt;
-extern int my_parse();
+extern void my_parse();
extern int yydebug;
extern FILE *yyin;
diff --git a/user/legacy-84/drbdadm_main.c b/user/legacy-84/drbdadm_main.c
index ba894ee..b3ae91a 100644
--- a/user/legacy-84/drbdadm_main.c
+++ b/user/legacy-84/drbdadm_main.c
@@ -129,7 +129,7 @@ struct option general_admopt[] = {
};
struct option *admopt = general_admopt;
-extern int my_parse();
+extern void my_parse();
extern int yydebug;
extern FILE *yyin;
diff --git a/user/legacy/drbdadm_main.c b/user/legacy/drbdadm_main.c
index f5710a5..ccdacb4 100644
--- a/user/legacy/drbdadm_main.c
+++ b/user/legacy/drbdadm_main.c
@@ -117,7 +117,7 @@ struct option admopt[] = {
{0, 0, 0, 0}
};
-extern int my_parse();
+extern void my_parse();
extern int yydebug;
extern FILE *yyin;
--
2.0.0.rc2
More information about the drbd-dev
mailing list