GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-02-10 16:57:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

libopts: updated to 5.18.6

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2015-11-28 20:03:09 +01:00
parent 3e5a78d500
commit 0ba6330d37
57 changed files with 756 additions and 712 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
libopts/enum.c
View File

@@ -14,7 +14,7 @@
*
* This file is part of AutoOpts, a companion to AutoGen.
* AutoOpts is free software.
* AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
* AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
*
* AutoOpts is available under any one of two licenses. The license
* in use must be one of these two and the choice is under the control
@@ -130,9 +130,10 @@ enum_err(tOptions * pOpts, tOptDesc * pOD,
*/
else {
unsigned int ent_no = 0;
char zFmt[16]; /* format for all-but-last entries on a line */
char fmt[16]; /* format for all-but-last entries on a line */
sprintf(zFmt, ENUM_ERR_WIDTH, (int)max_len);
if (snprintf(fmt, 16, ENUM_ERR_WIDTH, (int)max_len) >= 16)
option_exits(EXIT_FAILURE);
max_len = 78 / max_len; /* max_len is now max entries on a line */
fputs(TWO_SPACES_STR, option_usage_fp);
@@ -150,7 +151,7 @@ enum_err(tOptions * pOpts, tOptDesc * pOD,
}
else
fprintf(option_usage_fp, zFmt, *(paz_names++) );
fprintf(option_usage_fp, fmt, *(paz_names++) );
}
fprintf(option_usage_fp, NLSTR_FMT, *paz_names);
}
@@ -186,14 +187,14 @@ find_name(char const * name, tOptions * pOpts, tOptDesc * pOD,
{
/*
* Return the matching index as a pointer sized integer.
* The result gets stashed in a char* pointer.
* The result gets stashed in a char * pointer.
*/
uintptr_t res = name_ct;
size_t len = strlen((char*)name);
size_t len = strlen((char *)name);
uintptr_t idx;
if (IS_DEC_DIGIT_CHAR(*name)) {
char * pz = (char *)(void *)name;
char * pz = VOIDP(name);
unsigned long val = strtoul(pz, &pz, 0);
if ((*pz == NUL) && (val < name_ct))
return (uintptr_t)val;
@@ -215,7 +216,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((char *)paz_names[idx], (char *)name, len) == 0) {
if (paz_names[idx][len] == NUL)
return idx; /* full match */
@@ -242,7 +243,7 @@ find_name(char const * name, tOptions * pOpts, tOptDesc * pOD,
* what: Convert between enumeration values and strings
* private:
*
* arg: tOptDesc*, pOD, enumeration option description
* arg: tOptDesc *, pOD, enumeration option description
* arg: unsigned int, enum_val, the enumeration value to map
*
* ret_type: char const *
@@ -265,8 +266,8 @@ optionKeywordName(tOptDesc * pOD, unsigned int enum_val)
* what: Convert from a string to an enumeration value
* private:
*
* arg: tOptions*, pOpts, the program options descriptor
* arg: tOptDesc*, pOD, enumeration option description
* arg: tOptions *, pOpts, the program options descriptor
* arg: tOptDesc *, pOD, enumeration option description
* arg: char const * const *, paz_names, list of enumeration names
* arg: unsigned int, name_ct, number of names in list
*
@@ -509,7 +510,7 @@ find_member_bit(tOptions * opts, tOptDesc * od, char const * pz, int len,
*
* arg: tOptDesc *, od, the set membership option description
*
* ret_type: char*
* ret_type: char *
* ret_desc: the names of the set bits
*
* doc: This converts the OPT_VALUE_name mask value to a allocated string.
@@ -521,7 +522,7 @@ optionMemberList(tOptDesc * od)
uintptr_t sv = od->optArg.argIntptr;
char * res;
(*(od->pOptProc))(OPTPROC_RETURN_VALNAME, od);
res = (void *)od->optArg.argString;
res = VOIDP(od->optArg.argString);
od->optArg.argIntptr = sv;
return res;
}
@@ -530,8 +531,8 @@ optionMemberList(tOptDesc * od)
* what: Convert between bit flag values and strings
* private:
*
* arg: tOptions*, opts, the program options descriptor
* arg: tOptDesc*, od, the set membership option description
* arg: tOptions *, opts, the program options descriptor
* arg: tOptDesc *, od, the set membership option description
* arg: char const * const *,
* nm_list, list of enumeration names
* arg: unsigned int, nm_ct, number of names in list
@@ -634,12 +635,12 @@ optionSetMembers(tOptions * opts, tOptDesc * od,
if (nm_ct < (8 * sizeof(uintptr_t)))
res &= (1UL << nm_ct) - 1UL;
od->optCookie = (void *)res;
od->optCookie = VOIDP(res);
}
return;
fail_return:
od->optCookie = (void *)0;
od->optCookie = VOIDP(0);
}
/** @}