osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

ws_getopt: Fix some clang warnings. 

Fix

wsutil/ws_getopt.c:93:21: error: possible misuse of comma operator here [-Werror,-Wcomma]
                return ws_optind++, -1;
                                  ^
wsutil/ws_getopt.c:93:10: note: cast expression to void to silence warning
                return ws_optind++, -1;
                       ^~~~~~~~~~~
                       (void)(    )
wsutil/ws_getopt.c:188:11: error: possible misuse of comma operator here [-Werror,-Wcomma]
                                name++, opt++;
                                      ^
wsutil/ws_getopt.c:188:5: note: cast expression to void to silence warning
                                name++, opt++;
                                ^~~~~~
                                (void)( )
wsutil/ws_getopt.c:199:15: error: implicit conversion loses integer precision: 'long' to 'int' [-Werror,-Wshorten-64-to-32]
                        int l = arg-start;
                            ~   ~~~^~~~~~

Add a .editorconfig entry for ws_getopt.[ch].
This commit is contained in:
Gerald Combs 2021-09-16 17:54:44 -07:00
parent ac3a30f61b
commit 3c484f278b
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wsutil/.editorconfig
View File

@ -110,6 +110,10 @@ indent_size = 2
[unicode-utils.[ch]]
indent_size = 2
[ws_getopt.[ch]]
indent_style = tab
indent_size = tab
[ws_mempbrk.[ch]]
indent_style = tab
indent_size = tab

16
wsutil/ws_getopt.c
View File

@ -89,8 +89,10 @@ int ws_getopt(int argc, char * const argv[], const char *optstring)
if (!argv[ws_optind][1])
return -1;
if (argv[ws_optind][1] == '-' && !argv[ws_optind][2])
return ws_optind++, -1;
if (argv[ws_optind][1] == '-' && !argv[ws_optind][2]) {
ws_optind++;
return -1;
}
if (!ws_optpos) ws_optpos++;
if ((k = mbtowc(&c, argv[ws_optind]+ws_optpos, MB_LEN_MAX)) < 0) {
@ -184,8 +186,10 @@ static int __getopt_long_core(int argc, char *const *argv, const char *optstring
const char *name = longopts[i].name;
opt = start;
if (*opt == '-') opt++;
while (*opt && *opt != '=' && *opt == *name)
name++, opt++;
while (*opt && *opt != '=' && *opt == *name) {
name++;
opt++;
}
if (*opt && *opt != '=') continue;
arg = opt;
match = i;
@ -196,9 +200,9 @@ static int __getopt_long_core(int argc, char *const *argv, const char *optstring
cnt++;
}
if (cnt==1 && longonly && arg-start == mblen(start, MB_LEN_MAX)) {
int l = arg-start;
ptrdiff_t l = arg - start;
for (i=0; optstring[i]; i++) {
int j;
ptrdiff_t j;
for (j=0; j<l && start[j]==optstring[i+j]; j++);
if (j==l) {
cnt++;