diff options
| author | David M. Syzdek <david@syzdek.net> | 2023-12-02 11:56:34 -0900 |
|---|---|---|
| committer | David M. Syzdek <david@syzdek.net> | 2023-12-02 11:56:34 -0900 |
| commit | abca77f0d399c7c458f8cfd65826d0b953c0689a (patch) | |
| tree | 6fe278cd2afe7fd8782b2d11c06bb1fb2fd8f530 | |
| parent | 93b997cae37a3ff30cee924d48c1cc02ab9e84d9 (diff) | |
| download | corset-abca77f0d399c7c458f8cfd65826d0b953c0689a.tar.gz corset-abca77f0d399c7c458f8cfd65826d0b953c0689a.tar.bz2 corset-abca77f0d399c7c458f8cfd65826d0b953c0689a.tar.xz corset-abca77f0d399c7c458f8cfd65826d0b953c0689a.zip | |
libcorset: updating variable names in corset_getopt()
| -rw-r--r-- | include/corset.h | 2 | ||||
| -rw-r--r-- | lib/libcorset/largs.c | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/include/corset.h b/include/corset.h index 7c3f62a..c4cf41d 100644 --- a/include/corset.h +++ b/include/corset.h | |||
| @@ -104,7 +104,7 @@ struct _corset | |||
| 104 | 104 | ||
| 105 | _CORSET_F int | 105 | _CORSET_F int |
| 106 | corset_getopt( | 106 | corset_getopt( |
| 107 | corset_t * cnf, | 107 | corset_t * ch, |
| 108 | int argc, | 108 | int argc, |
| 109 | char * const * argv, | 109 | char * const * argv, |
| 110 | const char * optstring ); | 110 | const char * optstring ); |
diff --git a/lib/libcorset/largs.c b/lib/libcorset/largs.c index 91d54f4..fad6290 100644 --- a/lib/libcorset/largs.c +++ b/lib/libcorset/largs.c | |||
| @@ -71,7 +71,7 @@ corset_version( | |||
| 71 | 71 | ||
| 72 | int | 72 | int |
| 73 | corset_getopt( | 73 | corset_getopt( |
| 74 | corset_t * cnf, | 74 | corset_t * ch, |
| 75 | int argc, | 75 | int argc, |
| 76 | char * const * argv, | 76 | char * const * argv, |
| 77 | const char * optstring ) | 77 | const char * optstring ) |
| @@ -90,7 +90,7 @@ corset_getopt( | |||
| 90 | { NULL, 0, NULL, 0 } | 90 | { NULL, 0, NULL, 0 } |
| 91 | }; | 91 | }; |
| 92 | 92 | ||
| 93 | assert(cnf != NULL); | 93 | assert(ch != NULL); |
| 94 | assert(argc != 0); | 94 | assert(argc != 0); |
| 95 | assert(argv != NULL); | 95 | assert(argv != NULL); |
| 96 | 96 | ||
| @@ -106,7 +106,7 @@ corset_getopt( | |||
| 106 | break; | 106 | break; |
| 107 | 107 | ||
| 108 | case 'f': | 108 | case 'f': |
| 109 | cnf->cor_flags |= CORSET_FLG_FOREGROUND; | 109 | ch->cor_flags |= CORSET_FLG_FOREGROUND; |
| 110 | break; | 110 | break; |
| 111 | 111 | ||
| 112 | case 'h': | 112 | case 'h': |
| @@ -114,7 +114,7 @@ corset_getopt( | |||
| 114 | return(2); | 114 | return(2); |
| 115 | 115 | ||
| 116 | case 'L': | 116 | case 'L': |
| 117 | if ((rc = corset_set_param(cnf, CORSET_OPT_MODDIR, optarg)) != 0) | 117 | if ((rc = corset_set_param(ch, CORSET_OPT_MODDIR, optarg)) != 0) |
| 118 | { | 118 | { |
| 119 | fprintf(stderr, "%s: %s\n", corset_prog_name_ptr, "out of virtual memory"); | 119 | fprintf(stderr, "%s: %s\n", corset_prog_name_ptr, "out of virtual memory"); |
| 120 | return(1); | 120 | return(1); |
| @@ -122,15 +122,15 @@ corset_getopt( | |||
| 122 | break; | 122 | break; |
| 123 | 123 | ||
| 124 | case 'q': | 124 | case 'q': |
| 125 | cnf->cor_flags |= CORSET_FLG_QUIET; | 125 | ch->cor_flags |= CORSET_FLG_QUIET; |
| 126 | break; | 126 | break; |
| 127 | 127 | ||
| 128 | case 'V': | 128 | case 'V': |
| 129 | corset_version(cnf); | 129 | corset_version(ch); |
| 130 | return(2); | 130 | return(2); |
| 131 | 131 | ||
| 132 | case 'v': | 132 | case 'v': |
| 133 | cnf->cor_verbose++; | 133 | ch->cor_verbose++; |
| 134 | break; | 134 | break; |
| 135 | 135 | ||
| 136 | case '?': | 136 | case '?': |
| @@ -144,7 +144,7 @@ corset_getopt( | |||
| 144 | }; | 144 | }; |
| 145 | }; | 145 | }; |
| 146 | 146 | ||
| 147 | if ( ((cnf->cor_flags & CORSET_FLG_QUIET)) && ((cnf->cor_verbose)) ) | 147 | if ( ((ch->cor_flags & CORSET_FLG_QUIET)) && ((ch->cor_verbose)) ) |
| 148 | { | 148 | { |
| 149 | fprintf(stderr, "%s: incompatible options `-q' and `-v'\n", corset_prog_name_ptr); | 149 | fprintf(stderr, "%s: incompatible options `-q' and `-v'\n", corset_prog_name_ptr); |
| 150 | fprintf(stderr, "Try `%s --help' for more information.\n", corset_prog_name_ptr); | 150 | fprintf(stderr, "Try `%s --help' for more information.\n", corset_prog_name_ptr); |
