diff options
Diffstat (limited to 'contrib/ntp/sntp/libopts')
-rw-r--r-- | contrib/ntp/sntp/libopts/configfile.c | 44 | ||||
-rw-r--r-- | contrib/ntp/sntp/libopts/enum.c | 10 | ||||
-rw-r--r-- | contrib/ntp/sntp/libopts/find.c | 2 | ||||
-rw-r--r-- | contrib/ntp/sntp/libopts/init.c | 5 | ||||
-rw-r--r-- | contrib/ntp/sntp/libopts/load.c | 2 | ||||
-rw-r--r-- | contrib/ntp/sntp/libopts/makeshell.c | 6 | ||||
-rw-r--r-- | contrib/ntp/sntp/libopts/nested.c | 4 | ||||
-rw-r--r-- | contrib/ntp/sntp/libopts/parse-duration.c | 10 | ||||
-rw-r--r-- | contrib/ntp/sntp/libopts/reset.c | 2 | ||||
-rw-r--r-- | contrib/ntp/sntp/libopts/save.c | 4 | ||||
-rw-r--r-- | contrib/ntp/sntp/libopts/tokenize.c | 2 |
11 files changed, 49 insertions, 42 deletions
diff --git a/contrib/ntp/sntp/libopts/configfile.c b/contrib/ntp/sntp/libopts/configfile.c index 03156ca..8244371e 100644 --- a/contrib/ntp/sntp/libopts/configfile.c +++ b/contrib/ntp/sntp/libopts/configfile.c @@ -182,9 +182,9 @@ optionFindValue(const tOptDesc * odesc, char const * name, char const * val) } else do { - tArgList * argl = odesc->optCookie; - int argct = argl->useCt; - void ** poptv = (void **)(argl->apzArgs); + tArgList * argl = odesc->optCookie; + int argct = argl->useCt; + const void ** poptv = VOIDP(argl->apzArgs); if (argct == 0) { errno = ENOENT; @@ -192,7 +192,7 @@ optionFindValue(const tOptDesc * odesc, char const * name, char const * val) } if (name == NULL) { - res = (tOptionValue *)*poptv; + res = (const tOptionValue *)*poptv; break; } @@ -249,7 +249,7 @@ optionFindNextValue(const tOptDesc * odesc, const tOptionValue * pPrevVal, char const * pzName, char const * pzVal) { bool old_found = false; - tOptionValue * res = NULL; + const tOptionValue * res = NULL; (void)pzName; (void)pzVal; @@ -264,12 +264,12 @@ optionFindNextValue(const tOptDesc * odesc, const tOptionValue * pPrevVal, } else do { - tArgList * argl = odesc->optCookie; - int ct = argl->useCt; - void ** poptv = (void **)argl->apzArgs; + tArgList * argl = odesc->optCookie; + int ct = argl->useCt; + const void ** poptv = VOIDP(argl->apzArgs); while (--ct >= 0) { - tOptionValue * pOV = *(poptv++); + const tOptionValue * pOV = *(poptv++); if (old_found) { res = pOV; break; @@ -315,8 +315,8 @@ optionFindNextValue(const tOptDesc * odesc, const tOptionValue * pPrevVal, tOptionValue const * optionGetValue(tOptionValue const * oov, char const * vname) { - tArgList * arg_list; - tOptionValue * res = NULL; + tArgList * arg_list; + const tOptionValue * res = NULL; if ((oov == NULL) || (oov->valType != OPARG_TYPE_HIERARCHY)) { errno = EINVAL; @@ -325,14 +325,14 @@ optionGetValue(tOptionValue const * oov, char const * vname) arg_list = oov->v.nestVal; if (arg_list->useCt > 0) { - int ct = arg_list->useCt; - void ** ovlist = (void **)(arg_list->apzArgs); + int ct = arg_list->useCt; + const void ** ovlist = VOIDP(arg_list->apzArgs); if (vname == NULL) { - res = (tOptionValue *)*ovlist; + res = (const tOptionValue *)*ovlist; } else do { - tOptionValue * opt_val = *(ovlist++); + const tOptionValue * opt_val = *(ovlist++); if (strcmp(opt_val->pzName, vname) == 0) { res = opt_val; break; @@ -374,9 +374,9 @@ optionGetValue(tOptionValue const * oov, char const * vname) tOptionValue const * optionNextValue(tOptionValue const * ov_list,tOptionValue const * oov ) { - tArgList * arg_list; - tOptionValue * res = NULL; - int err = EINVAL; + tArgList * arg_list; + const tOptionValue * res = NULL; + int err = EINVAL; if ((ov_list == NULL) || (ov_list->valType != OPARG_TYPE_HIERARCHY)) { errno = EINVAL; @@ -384,18 +384,18 @@ optionNextValue(tOptionValue const * ov_list,tOptionValue const * oov ) } arg_list = ov_list->v.nestVal; { - int ct = arg_list->useCt; - void ** o_list = (void **)(arg_list->apzArgs); + int ct = arg_list->useCt; + const void ** o_list = VOIDP(arg_list->apzArgs); while (ct-- > 0) { - tOptionValue * nov = *(o_list++); + const tOptionValue * nov = *(o_list++); if (nov == oov) { if (ct == 0) { err = ENOENT; } else { err = 0; - res = (tOptionValue *)*o_list; + res = (const tOptionValue *)*o_list; } break; } diff --git a/contrib/ntp/sntp/libopts/enum.c b/contrib/ntp/sntp/libopts/enum.c index 3345558..e9bba83 100644 --- a/contrib/ntp/sntp/libopts/enum.c +++ b/contrib/ntp/sntp/libopts/enum.c @@ -189,12 +189,12 @@ find_name(char const * name, tOptions * pOpts, tOptDesc * pOD, * The result gets stashed in a char * pointer. */ uintptr_t res = name_ct; - size_t len = strlen((char *)name); + size_t len = strlen(name); uintptr_t idx; if (IS_DEC_DIGIT_CHAR(*name)) { - char * pz = VOIDP(name); - unsigned long val = strtoul(pz, &pz, 0); + char * pz; + unsigned long val = strtoul(name, &pz, 0); if ((*pz == NUL) && (val < name_ct)) return (uintptr_t)val; pz_enum_err_fmt = znum_too_large; @@ -215,7 +215,7 @@ find_name(char const * name, tOptions * pOpts, tOptDesc * pOD, * Multiple partial matches means we have an ambiguous match. */ for (idx = 0; idx < name_ct; idx++) { - if (strncmp((char *)paz_names[idx], (char *)name, len) == 0) { + if (strncmp(paz_names[idx], name, len) == 0) { if (paz_names[idx][len] == NUL) return idx; /* full match */ @@ -500,7 +500,7 @@ find_member_bit(tOptions * opts, tOptDesc * od, char const * pz, int len, if (shift_ct >= nm_ct) return 0UL; - return 1UL << shift_ct; + return (uintptr_t)1U << shift_ct; } } diff --git a/contrib/ntp/sntp/libopts/find.c b/contrib/ntp/sntp/libopts/find.c index 90591cc..97a24df 100644 --- a/contrib/ntp/sntp/libopts/find.c +++ b/contrib/ntp/sntp/libopts/find.c @@ -80,7 +80,7 @@ parse_opt(char const ** nm_pp, char ** arg_pp, char * buf, size_t bufsz) buf[res] = NUL; *nm_pp = buf; - *arg_pp = (char *)p; + *arg_pp = VOIDP(p); return res; default: diff --git a/contrib/ntp/sntp/libopts/init.c b/contrib/ntp/sntp/libopts/init.c index e02e1e1..81d4eee 100644 --- a/contrib/ntp/sntp/libopts/init.c +++ b/contrib/ntp/sntp/libopts/init.c @@ -97,15 +97,14 @@ validate_struct(tOptions * opts, char const * pname) */ if (opts->pzProgName == NULL) { char const * pz = strrchr(pname, DIRCH); - char const ** pp = - (char const **)(void **)&(opts->pzProgName); + char const ** pp = VOIDP(&(opts->pzProgName)); if (pz != NULL) *pp = pz+1; else *pp = pname; - pz = pathfind(getenv("PATH"), (char *)pname, "rx"); + pz = pathfind(getenv("PATH"), pname, "rx"); if (pz != NULL) pname = VOIDP(pz); diff --git a/contrib/ntp/sntp/libopts/load.c b/contrib/ntp/sntp/libopts/load.c index b5230af..ccda5b4 100644 --- a/contrib/ntp/sntp/libopts/load.c +++ b/contrib/ntp/sntp/libopts/load.c @@ -225,7 +225,7 @@ add_prog_path(char * buf, int b_sz, char const * fname, char const * prg_path) if (strchr(prg_path, DIRCH) != NULL) path = prg_path; else { - path = pathfind(getenv("PATH"), (char *)prg_path, "rx"); + path = pathfind(getenv("PATH"), prg_path, "rx"); if (path == NULL) return false; diff --git a/contrib/ntp/sntp/libopts/makeshell.c b/contrib/ntp/sntp/libopts/makeshell.c index a61df42..fbe8e17 100644 --- a/contrib/ntp/sntp/libopts/makeshell.c +++ b/contrib/ntp/sntp/libopts/makeshell.c @@ -401,7 +401,7 @@ emit_usage(tOptions * opts) /* Copy the program name into the time/name buffer */ for (;;) { - if ((*pzPN++ = (char)tolower(*pz++)) == NUL) + if ((*pzPN++ = (char)tolower((unsigned char)*pz++)) == NUL) break; } @@ -671,8 +671,8 @@ emit_match_expr(char const * name, tOptDesc * cod, tOptions * opts) continue; match_ct = 0; - while ( toupper(od->pz_DisableName[match_ct]) - == toupper(name[match_ct])) + while ( toupper((unsigned char)od->pz_DisableName[match_ct]) + == toupper((unsigned char)name[match_ct])) match_ct++; if (match_ct > min_match_ct) min_match_ct = match_ct; diff --git a/contrib/ntp/sntp/libopts/nested.c b/contrib/ntp/sntp/libopts/nested.c index f4fb226..aaf089f 100644 --- a/contrib/ntp/sntp/libopts/nested.c +++ b/contrib/ntp/sntp/libopts/nested.c @@ -859,6 +859,7 @@ LOCAL int get_special_char(char const ** ppz, int * ct) { char const * pz = *ppz; + char * rz; if (*ct < 3) return '&'; @@ -872,7 +873,8 @@ get_special_char(char const ** ppz, int * ct) base = 16; pz++; } - retch = (int)strtoul(pz, (char **)&pz, base); + retch = (int)strtoul(pz, &rz, base); + pz = rz; if (*pz != ';') return '&'; base = (int)(++pz - *ppz); diff --git a/contrib/ntp/sntp/libopts/parse-duration.c b/contrib/ntp/sntp/libopts/parse-duration.c index e072b7d..11e3d828 100644 --- a/contrib/ntp/sntp/libopts/parse-duration.c +++ b/contrib/ntp/sntp/libopts/parse-duration.c @@ -60,14 +60,20 @@ typedef enum { static unsigned long str_const_to_ul (cch_t * str, cch_t ** ppz, int base) { - return strtoul (str, (char **)ppz, base); + char * pz; + int rv = strtoul (str, &pz, base); + *ppz = pz; + return rv; } /* Wrapper around strtol that does not require a cast. */ static long str_const_to_l (cch_t * str, cch_t ** ppz, int base) { - return strtol (str, (char **)ppz, base); + char * pz; + int rv = strtol (str, &pz, base); + *ppz = pz; + return rv; } /* Returns BASE + VAL * SCALE, interpreting BASE = BAD_TIME diff --git a/contrib/ntp/sntp/libopts/reset.c b/contrib/ntp/sntp/libopts/reset.c index 6ca2c05..97ecb52 100644 --- a/contrib/ntp/sntp/libopts/reset.c +++ b/contrib/ntp/sntp/libopts/reset.c @@ -113,7 +113,7 @@ optionResetOpt(tOptions * pOpts, tOptDesc * pOD) assert(0 == 1); } } else { - succ = opt_find_long(pOpts, (char *)pzArg, &opt_state); + succ = opt_find_long(pOpts, pzArg, &opt_state); if (! SUCCESSFUL(succ)) { fprintf(stderr, zIllOptStr, pOpts->pzProgPath, pzArg); pOpts->pUsageProc(pOpts, EXIT_FAILURE); diff --git a/contrib/ntp/sntp/libopts/save.c b/contrib/ntp/sntp/libopts/save.c index f462ced..cdab05f 100644 --- a/contrib/ntp/sntp/libopts/save.c +++ b/contrib/ntp/sntp/libopts/save.c @@ -453,7 +453,7 @@ prt_val_list(FILE * fp, char const * name, tArgList * al) if (al == NULL) return; opt_ct = al->useCt; - opt_list = (void **)al->apzArgs; + opt_list = VOIDP(al->apzArgs); if (opt_ct <= 0) { fprintf(fp, OPEN_CLOSE_FMT, name); @@ -488,7 +488,7 @@ prt_nested(FILE * fp, tOptDesc * p) return; opt_ct = al->useCt; - opt_list = (void **)al->apzArgs; + opt_list = VOIDP(al->apzArgs); if (opt_ct <= 0) return; diff --git a/contrib/ntp/sntp/libopts/tokenize.c b/contrib/ntp/sntp/libopts/tokenize.c index cbff7fb..25550ea 100644 --- a/contrib/ntp/sntp/libopts/tokenize.c +++ b/contrib/ntp/sntp/libopts/tokenize.c @@ -57,7 +57,7 @@ copy_cooked(ch_t ** ppDest, char const ** ppSrc) case NUL: *ppSrc = NULL; return; case '"': goto done; case '\\': - pSrc += ao_string_cook_escape_char((char *)pSrc, (char *)&ch, 0x7F); + pSrc += ao_string_cook_escape_char((const char *)pSrc, (char *)&ch, 0x7F); if (ch == 0x7F) break; /* FALLTHROUGH */ |