head 1.1; access; symbols pkgsrc-2026Q1:1.1.0.112 pkgsrc-2026Q1-base:1.1 pkgsrc-2025Q4:1.1.0.110 pkgsrc-2025Q4-base:1.1 pkgsrc-2025Q3:1.1.0.108 pkgsrc-2025Q3-base:1.1 pkgsrc-2025Q2:1.1.0.106 pkgsrc-2025Q2-base:1.1 pkgsrc-2025Q1:1.1.0.104 pkgsrc-2025Q1-base:1.1 pkgsrc-2024Q4:1.1.0.102 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.100 pkgsrc-2024Q3-base:1.1 pkgsrc-2024Q2:1.1.0.98 pkgsrc-2024Q2-base:1.1 pkgsrc-2024Q1:1.1.0.96 pkgsrc-2024Q1-base:1.1 pkgsrc-2023Q4:1.1.0.94 pkgsrc-2023Q4-base:1.1 pkgsrc-2023Q3:1.1.0.92 pkgsrc-2023Q3-base:1.1 pkgsrc-2023Q2:1.1.0.90 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.88 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.86 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.84 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.82 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.80 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.78 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.76 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.74 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.72 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.70 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.68 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.64 pkgsrc-2020Q2-base:1.1 pkgsrc-2020Q1:1.1.0.44 pkgsrc-2020Q1-base:1.1 pkgsrc-2019Q4:1.1.0.66 pkgsrc-2019Q4-base:1.1 pkgsrc-2019Q3:1.1.0.62 pkgsrc-2019Q3-base:1.1 pkgsrc-2019Q2:1.1.0.60 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.58 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.56 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.54 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.52 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.50 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.48 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.46 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.42 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.40 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.38 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.36 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.34 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.32 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.30 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.28 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.26 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.24 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.22 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.20 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.18 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.16 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.14 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.12 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.10 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.8 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.6 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.4 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.2 pkgsrc-2012Q2-base:1.1; locks; strict; comment @# @; 1.1 date 2012.05.10.20.53.30; author dholland; state Exp; branches; next ; desc @@ 1.1 log @Pass -Wall. Fix a number of minor bugs and possibly some major ones. Should also fix clang build. PKGREVISION++ @ text @$NetBSD$ - don't use implicit int - const correctness required by existing const declarations - return NULL on some unreachable paths - fix uninitialized variable bug caught by gcc - silence gcc 4.1 parenthesis warning --- src/eval.c~ 2012-05-10 19:25:36.000000000 +0000 +++ src/eval.c @@@@ -68,7 +68,7 @@@@ UTABLE *ut; /* table to clear */ free(ut); } -char *PASCAL NEAR gtfun(fname) /* evaluate a function */ +CONST char *PASCAL NEAR gtfun(fname) /* evaluate a function */ char *fname; /* name of function to evaluate */ @@@@ -237,9 +237,10 @@@@ char *fname; /* name of function to eva } meexit(-11); /* never should get here */ + return NULL; } -char *PASCAL NEAR gtusr(vname) /* look up a user var's value */ +CONST char *PASCAL NEAR gtusr(vname) /* look up a user var's value */ char *vname; /* name of user variable to fetch */ @@@@ -299,7 +300,7 @@@@ int i; return(envars[i]); } -PASCAL NEAR binary(key, tval, tlength, klength) +int PASCAL NEAR binary(key, tval, tlength, klength) char *key; /* key string to look for */ char *(PASCAL NEAR *tval)(); /* ptr to function to fetch table value with */ @@@@ -331,7 +332,7 @@@@ int klength; /* maximum length of strin return(-1); } -char *PASCAL NEAR gtenv(vname) +CONST char *PASCAL NEAR gtenv(vname) char *vname; /* name of environment variable to retrieve */ @@@@ -451,11 +452,12 @@@@ char *vname; /* name of environment var case EVYPOS: return(int_asc(ypos)); } meexit(-12); /* again, we should never get here */ + return NULL; } -char *PASCAL NEAR fixnull(s) /* Don't return NULL pointers! */ +CONST char *PASCAL NEAR fixnull(s) /* Don't return NULL pointers! */ -char *s; +CONST char *s; { if (s == NULL) @@@@ -753,6 +755,7 @@@@ int scope; /* intended scope of any crea fvar: vtype = -1; vut = uv_head; + vnum = -1; switch (var[0]) { @@@@ -1245,7 +1248,7 @@@@ char *token; /* token to analyze */ } } -char *PASCAL NEAR getval(token) /* find the value of a token */ +CONST char *PASCAL NEAR getval(token) /* find the value of a token */ char *token; /* token to evaluate */ @@@@ -1316,6 +1319,7 @@@@ char *token; /* token to evaluate */ case TKSTR: return(token+1); case TKCMD: return(token); } + return NULL; } int PASCAL NEAR stol(val) /* convert a string to a numeric logical */ @@@@ -1333,7 +1337,7 @@@@ char *val; /* value to check for stol */ return((asc_int(val) != 0)); } -char *PASCAL NEAR ltos(val) /* numeric logical to string logical */ +CONST char *PASCAL NEAR ltos(val) /* numeric logical to string logical */ int val; /* value to translate */ @@@@ -1470,7 +1474,7 @@@@ xnext: ++sp; /* setwlist: Set an alternative list of character to be considered "in a word */ -PASCAL NEAR setwlist(wclist) +VOID PASCAL NEAR setwlist(wclist) char *wclist; /* list of characters to consider "in a word" */ @@@@ -1539,7 +1543,7 @@@@ char *st; /* scan digits */ period_flag = FALSE; - while ((*st >= '0') && (*st <= '9') || + while ((*st >= '0' && *st <= '9') || (*st == '.' && period_flag == FALSE)) { if (*st == '.') period_flag = TRUE; @@@@ -1605,7 +1609,7 @@@@ int n; /* numeric arg (can overide prom of all the environment variables */ -PASCAL NEAR desvars(f, n) +int PASCAL NEAR desvars(f, n) int f,n; /* prefix flag and argument */ @