From e04c64aa82b92593648067fd0b4df81fc55e419e Mon Sep 17 00:00:00 2001 From: Jim Monte Date: Tue, 26 Mar 2019 22:57:42 +0100 Subject: [PATCH] [PATCH 33 1/6] Fixed Visual Studio C4028 compiler warnings related to mismatches between prototypes and function definitions Signed-off-by: Holger Vogt --- src/frontend/numparam/numparam.h | 3 ++- src/frontend/numparam/xpressn.c | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/frontend/numparam/numparam.h b/src/frontend/numparam/numparam.h index dce89514c..d9258787d 100644 --- a/src/frontend/numparam/numparam.h +++ b/src/frontend/numparam/numparam.h @@ -62,7 +62,8 @@ bool defsubckt(dico_t *, struct card *); int findsubckt(dico_t *, const char *s); bool nupa_substitute(dico_t *, const char *s, char *r); bool nupa_assignment(dico_t *, const char *s, char mode); -bool nupa_subcktcall(dico_t *, char *s, char *x, char *inst_name); +bool nupa_subcktcall(dico_t *, const char *s, const char *x, + char *inst_name); void nupa_subcktexit(dico_t *); entry_t *entrynb(dico_t *dico, char *s); entry_t *attrib(dico_t *, NGHASHPTR htable, char *t, char op); diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c index 5f0cf740f..6c5d6072d 100644 --- a/src/frontend/numparam/xpressn.c +++ b/src/frontend/numparam/xpressn.c @@ -535,7 +535,7 @@ defsubckt(dico_t *dico, struct card *card) int -findsubckt(dico_t *dico, const char * const s) +findsubckt(dico_t *dico, const char *s) /* input: s is a subcircuit invocation line. returns 0 if not found, else the stored definition line number value */ { @@ -1292,7 +1292,7 @@ getexpress(nupa_type *type, SPICE_DSTRINGPTR tstr_p, const char *s) bool -nupa_assignment(dico_t *dico, const char * const s, char mode) +nupa_assignment(dico_t *dico, const char *s, char mode) /* is called for all 'Param' lines of the input file. is also called for the params: section of a subckt . mode='N' define new local variable, else global... @@ -1399,7 +1399,8 @@ search_isolated_identifier(char *str, const char *identifier) bool -nupa_subcktcall(dico_t *dico, char *s, char * const x, char * const inst_name) +nupa_subcktcall(dico_t *dico, const char *s, const char *x, + char *inst_name) /* s= a subckt define line, with formal params. x= a matching subckt call line, with actual params */