From e1a7721fe04ace25388a3438a0d943bb183245bc Mon Sep 17 00:00:00 2001 From: midipix Date: Thu, 9 Aug 2018 05:56:15 -0400 Subject: front-end utility: pe_main(): remove the redundant argc parameter. --- include/perk/perk.h | 2 +- project/overrides.mk | 1 + src/driver/pe_amain.c | 4 ++-- src/perk.c | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/perk/perk.h b/include/perk/perk.h index 2860c53..bc6ea8f 100644 --- a/include/perk/perk.h +++ b/include/perk/perk.h @@ -189,7 +189,7 @@ perk_api int pe_get_driver_fdctx (const struct pe_driver_ctx *, struct pe perk_api int pe_set_driver_fdctx (struct pe_driver_ctx *, const struct pe_fd_ctx *); /* utility api */ -perk_api int pe_main (int, char **, char **, const struct pe_fd_ctx *); +perk_api int pe_main (char **, char **, const struct pe_fd_ctx *); perk_api int pe_output_image_category (const struct pe_driver_ctx *, const struct pe_image_meta *); perk_api int pe_output_image_sections (const struct pe_driver_ctx *, const struct pe_image_meta *); 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/pe_amain.c b/src/driver/pe_amain.c index 585d50a..50d18ac 100644 --- a/src/driver/pe_amain.c +++ b/src/driver/pe_amain.c @@ -83,7 +83,7 @@ static int pe_exit(struct pe_driver_ctx * dctx, int ret) return ret; } -int pe_main(int argc, char ** argv, char ** envp, const struct pe_fd_ctx * fdctx) +int pe_main(char ** argv, char ** envp, const struct pe_fd_ctx * fdctx) { int ret; int fdout; @@ -97,7 +97,7 @@ int pe_main(int argc, char ** argv, char ** envp, const struct pe_fd_ctx * fdctx if ((ret = pe_get_driver_ctx(argv,envp,flags,fdctx,&dctx))) return (ret == PERK_USAGE) - ? !--argc + ? !argv || !argv[0] || !argv[1] : PERK_ERROR; if (dctx->cctx->drvflags & PERK_DRIVER_VERSION) diff --git a/src/perk.c b/src/perk.c index 96e5c81..0bd6cee 100644 --- a/src/perk.c +++ b/src/perk.c @@ -8,5 +8,5 @@ int main(int argc, char ** argv, char ** envp) { - return pe_main(argc,argv,envp,0); + return pe_main(argv,envp,0); } -- cgit v1.2.3