summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2018-08-09 10:09:04 (GMT)
committermidipix <writeonce@midipix.org>2018-08-09 10:09:04 (GMT)
commit85cfaaf90eed065df038384a2874f60cce395e47 (patch)
treeae0b6cce25a76e99ae1cf4be9ad4ba6439a91de9
parent4a448ba34fa7ff92bcf51ec643dd96d6097f7c8b (diff)
downloadmdso-85cfaaf90e.tar.bz2
mdso-85cfaaf90e.tar.xz
front-end utility: mdso_main(): remove the redundant argc parameter.
-rw-r--r--include/mdso/mdso.h2
-rw-r--r--project/overrides.mk1
-rw-r--r--src/driver/mdso_amain.c4
-rw-r--r--src/mdso.c2
4 files changed, 5 insertions, 4 deletions
diff --git a/include/mdso/mdso.h b/include/mdso/mdso.h
index 378cb2b..26d0fb0 100644
--- a/include/mdso/mdso.h
+++ b/include/mdso/mdso.h
@@ -159,7 +159,7 @@ mdso_api int mdso_create_object (const struct mdso_driver_ctx *, struct
mdso_api int mdso_create_archive (const struct mdso_driver_ctx *, struct mdso_object *);
/* utility api */
-mdso_api int mdso_main (int, char **, char **, const struct mdso_fd_ctx *);
+mdso_api int mdso_main (char **, char **, const struct mdso_fd_ctx *);
mdso_api int mdso_create_implib_archive(const struct mdso_driver_ctx *);
mdso_api int mdso_create_implib_sources(const struct mdso_driver_ctx *);
mdso_api int mdso_create_implib_objects(const struct mdso_driver_ctx *);
diff --git a/project/overrides.mk b/project/overrides.mk
index e69de29..4ac3b36 100644
--- a/project/overrides.mk
+++ b/project/overrides.mk
@@ -0,0 +1 @@
+src/$(PACKAGE).o: CFLAGS_CONFIG += -Wno-unused-parameter
diff --git a/src/driver/mdso_amain.c b/src/driver/mdso_amain.c
index a3265cc..bed201d 100644
--- a/src/driver/mdso_amain.c
+++ b/src/driver/mdso_amain.c
@@ -64,7 +64,7 @@ static int mdso_exit(struct mdso_driver_ctx * dctx, int ret)
return ret;
}
-int mdso_main(int argc, char ** argv, char ** envp, const struct mdso_fd_ctx * fdctx)
+int mdso_main(char ** argv, char ** envp, const struct mdso_fd_ctx * fdctx)
{
int ret;
int fdout;
@@ -78,7 +78,7 @@ int mdso_main(int argc, char ** argv, char ** envp, const struct mdso_fd_ctx * f
if ((ret = mdso_get_driver_ctx(argv,envp,flags,fdctx,&dctx)))
return (ret == MDSO_USAGE)
- ? !--argc
+ ? !argv || !argv[0] || !argv[1]
: MDSO_ERROR;
if (dctx->cctx->drvflags & MDSO_DRIVER_VERSION)
diff --git a/src/mdso.c b/src/mdso.c
index 423f2ac..3ba66e7 100644
--- a/src/mdso.c
+++ b/src/mdso.c
@@ -8,5 +8,5 @@
int main(int argc, char ** argv, char ** envp)
{
- return mdso_main(argc,argv,envp,0);
+ return mdso_main(argv,envp,0);
}