From a1ee30c645dd90f1a6e84a3527b37e8666d7db91 Mon Sep 17 00:00:00 2001 From: Brian Taylor Date: Tue, 13 May 2025 19:01:09 -0700 Subject: [PATCH] Fix some more -Wextra warnings. --- src/frontend/inpcom.c | 3 +-- src/frontend/resource.c | 2 ++ src/xspice/icm/digital/d_tristate/cfunc.mod | 6 ++++-- src/xspice/mif/mifgetvalue.c | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/frontend/inpcom.c b/src/frontend/inpcom.c index af230c9c1..6f60a05a5 100644 --- a/src/frontend/inpcom.c +++ b/src/frontend/inpcom.c @@ -5251,12 +5251,11 @@ int get_number_terminals(char *c) break; } case 'p': /* Recognition of up to 100 cpl nodes */ - for (i = j = 0; (i < 100) && (*c != '\0'); ++i) { + for (i = j = 0; (i < 100) && (*c != '\0'); i = i + 2) { inst = gettok_instance(&c); if (strchr(inst, '=')) j++; tfree(inst); - i++; } if (i == 100) return 0; diff --git a/src/frontend/resource.c b/src/frontend/resource.c index 4f0478d07..2008efc48 100644 --- a/src/frontend/resource.c +++ b/src/frontend/resource.c @@ -550,6 +550,7 @@ static int get_sysmem(struct sys_mem *memall) #else +# ifdef notdef #include #include @@ -625,6 +626,7 @@ baseaddr(void) #endif } +#endif #endif diff --git a/src/xspice/icm/digital/d_tristate/cfunc.mod b/src/xspice/icm/digital/d_tristate/cfunc.mod index 1cfe07d3f..0009e8fc7 100644 --- a/src/xspice/icm/digital/d_tristate/cfunc.mod +++ b/src/xspice/icm/digital/d_tristate/cfunc.mod @@ -238,10 +238,12 @@ void cm_d_tristate(ARGS) if (idp[1].when <= TIME) { if (str == out->strength) { s_ctl = Idle; - idp[1].prev = str; + // quietly rude + idp[1].prev = (Digital_State_t)str; } else { s_ctl = Normal; - idp[1].prev = out->strength; + // quietly rude + idp[1].prev = (Digital_State_t)out->strength; idp[1].when = TIME + OUTPUT_DELAY(out); } } else { diff --git a/src/xspice/mif/mifgetvalue.c b/src/xspice/mif/mifgetvalue.c index 8c86e0865..c07c7ed84 100644 --- a/src/xspice/mif/mifgetvalue.c +++ b/src/xspice/mif/mifgetvalue.c @@ -108,7 +108,7 @@ static char *get_string(char **s, int is_array, Mif_Token_Type_t *token_type) end = *s; ret_str = copy_substring(beg, end); } - *token_type = MIF_STRING; + *token_type = MIF_STRING_TOK; return ret_str; }