helvetica/readarg
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

replace READOPT_ALLOC_STRINGS with READOPT_STRINGS

Browse source 
The word "alloc" could be misleading in this context.
This commit is contained in:
Lukas Wurzinger 2022-09-30 16:34:08 +02:00
parent 61446a3c89
commit b4b72a51d5
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
readopt.h
View file

@ -4,7 +4,7 @@
#include <stdio.h> #include <stdio.h>
#define READOPT_ALLOC_STRINGS(...) ((char *[]){__VA_ARGS__, NULL}) #define READOPT_STRINGS(...) ((char *[]){__VA_ARGS__, NULL})
enum readopt_error enum readopt_error
{ {

30
test/test.c
View file

@ -7,8 +7,8 @@ int main(int argc, char **argv)
struct readopt_opt opts[] = { struct readopt_opt opts[] = {
{ {
.names = { .names = {
[READOPT_FORM_SHORT] = READOPT_ALLOC_STRINGS("e", "x"), [READOPT_FORM_SHORT] = READOPT_STRINGS("e", "x"),
[READOPT_FORM_LONG] = READOPT_ALLOC_STRINGS("expr", "expression"), [READOPT_FORM_LONG] = READOPT_STRINGS("expr", "expression"),
}, },
.cont = { .cont = {
.req = 1, .req = 1,
@ -20,8 +20,8 @@ int main(int argc, char **argv)
}, },
{ {
.names = { .names = {
[READOPT_FORM_SHORT] = READOPT_ALLOC_STRINGS("c"), [READOPT_FORM_SHORT] = READOPT_STRINGS("c"),
[READOPT_FORM_LONG] = READOPT_ALLOC_STRINGS("config"), [READOPT_FORM_LONG] = READOPT_STRINGS("config"),
}, },
.cont = { .cont = {
.req = 1, .req = 1,
@ -35,8 +35,8 @@ int main(int argc, char **argv)
}, },
{ {
.names = { .names = {
[READOPT_FORM_SHORT] = READOPT_ALLOC_STRINGS("i"), [READOPT_FORM_SHORT] = READOPT_STRINGS("i"),
[READOPT_FORM_LONG] = READOPT_ALLOC_STRINGS("uri"), [READOPT_FORM_LONG] = READOPT_STRINGS("uri"),
}, },
.cont = { .cont = {
.req = 1, .req = 1,
@ -45,8 +45,8 @@ int main(int argc, char **argv)
}, },
{ {
.names = { .names = {
[READOPT_FORM_SHORT] = READOPT_ALLOC_STRINGS("b"), [READOPT_FORM_SHORT] = READOPT_STRINGS("b"),
[READOPT_FORM_LONG] = READOPT_ALLOC_STRINGS("backup", "backup-file"), [READOPT_FORM_LONG] = READOPT_STRINGS("backup", "backup-file"),
}, },
.cont = { .cont = {
.req = 1, .req = 1,
@ -55,8 +55,8 @@ int main(int argc, char **argv)
}, },
{ {
.names = { .names = {
[READOPT_FORM_SHORT] = READOPT_ALLOC_STRINGS("v"), [READOPT_FORM_SHORT] = READOPT_STRINGS("v"),
[READOPT_FORM_LONG] = READOPT_ALLOC_STRINGS("verbose"), [READOPT_FORM_LONG] = READOPT_STRINGS("verbose"),
}, },
.cont.oper.bounds.val = { .cont.oper.bounds.val = {
3, 3,
@ -64,14 +64,14 @@ int main(int argc, char **argv)
}, },
{ {
.names = { .names = {
[READOPT_FORM_SHORT] = READOPT_ALLOC_STRINGS("s"), [READOPT_FORM_SHORT] = READOPT_STRINGS("s"),
[READOPT_FORM_LONG] = READOPT_ALLOC_STRINGS("sort"), [READOPT_FORM_LONG] = READOPT_STRINGS("sort"),
}, },
.cont.oper.bounds.inf = 1, .cont.oper.bounds.inf = 1,
}, },
{ {
.names = { .names = {
[READOPT_FORM_LONG] = READOPT_ALLOC_STRINGS("help"), [READOPT_FORM_LONG] = READOPT_STRINGS("help"),
}, },
.cont.oper.bounds.val = { .cont.oper.bounds.val = {
1, 1,
@ -79,8 +79,8 @@ int main(int argc, char **argv)
}, },
{ {
.names = { .names = {
[READOPT_FORM_SHORT] = READOPT_ALLOC_STRINGS("V"), [READOPT_FORM_SHORT] = READOPT_STRINGS("V"),
[READOPT_FORM_LONG] = READOPT_ALLOC_STRINGS("version"), [READOPT_FORM_LONG] = READOPT_STRINGS("version"),
}, },
.cont.oper.bounds.val = { .cont.oper.bounds.val = {
1, 1,