diff options
author | Jon Eyolfson <jon@eyl.io> | 2016-02-10 11:52:31 -0500 |
---|---|---|
committer | ridiculousfish <corydoras@ridiculousfish.com> | 2016-02-10 11:35:47 -0800 |
commit | 96e688ea91da977ff0f8d82b798a69c79fdecdd7 (patch) | |
tree | 60fa38a0c97e6d766c33e47ff96b0e93698f1311 | |
parent | 52f8707c3e3f97a6a257a4fe7349aee45e9a5782 (diff) |
Remove const from _wgetopt_internal's argv argument
The argv argument may be modified on calls to exchange within the function and should not be const qualified (it's not true from the caller's point of view).
-rw-r--r-- | src/wgetopt.cpp | 8 | ||||
-rw-r--r-- | src/wgetopt.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/wgetopt.cpp b/src/wgetopt.cpp index 9cbe5418..2129d1b5 100644 --- a/src/wgetopt.cpp +++ b/src/wgetopt.cpp @@ -294,7 +294,7 @@ const wchar_t * wgetopter_t::_wgetopt_initialize(const wchar_t *optstring) If LONG_ONLY is nonzero, '-' as well as '--' can introduce long-named options. */ -int wgetopter_t::_wgetopt_internal(int argc, wchar_t *const *argv, const wchar_t *optstring, const struct woption *longopts, int *longind, int long_only) +int wgetopter_t::_wgetopt_internal(int argc, wchar_t **argv, const wchar_t *optstring, const struct woption *longopts, int *longind, int long_only) { woptarg = NULL; @@ -585,7 +585,7 @@ int wgetopter_t::_wgetopt_internal(int argc, wchar_t *const *argv, const wchar_t } } -int wgetopter_t::wgetopt(int argc, wchar_t *const *argv, const wchar_t *optstring) +int wgetopter_t::wgetopt(int argc, wchar_t **argv, const wchar_t *optstring) { return _wgetopt_internal(argc, argv, optstring, (const struct woption *) 0, @@ -593,12 +593,12 @@ int wgetopter_t::wgetopt(int argc, wchar_t *const *argv, const wchar_t *optstrin 0); } -int wgetopter_t::wgetopt_long(int argc, wchar_t *const *argv, const wchar_t *options, const struct woption *long_options, int *opt_index) +int wgetopter_t::wgetopt_long(int argc, wchar_t **argv, const wchar_t *options, const struct woption *long_options, int *opt_index) { return _wgetopt_internal(argc, argv, options, long_options, opt_index, 0); } -int wgetopter_t::wgetopt_long_only(int argc, wchar_t *const *argv, const wchar_t *options, const struct woption *long_options, int *opt_index) +int wgetopter_t::wgetopt_long_only(int argc, wchar_t **argv, const wchar_t *options, const struct woption *long_options, int *opt_index) { return _wgetopt_internal(argc, argv, options, long_options, opt_index, 1); } diff --git a/src/wgetopt.h b/src/wgetopt.h index 91d50489..462bc291 100644 --- a/src/wgetopt.h +++ b/src/wgetopt.h @@ -54,7 +54,7 @@ class wgetopter_t private: void exchange(wchar_t **argv); const wchar_t * _wgetopt_initialize(const wchar_t *optstring); - int _wgetopt_internal(int argc, wchar_t *const *argv, const wchar_t *optstring, const struct woption *longopts, int *longind, int long_only); + int _wgetopt_internal(int argc, wchar_t **argv, const wchar_t *optstring, const struct woption *longopts, int *longind, int long_only); public: /* For communication from `getopt' to the caller. @@ -147,9 +147,9 @@ public: { } - int wgetopt(int argc, wchar_t *const *argv, const wchar_t *optstring); - int wgetopt_long(int argc, wchar_t *const *argv, const wchar_t *options, const struct woption *long_options, int *opt_index); - int wgetopt_long_only(int argc, wchar_t *const *argv, const wchar_t *options, const struct woption *long_options, int *opt_index); + int wgetopt(int argc, wchar_t **argv, const wchar_t *optstring); + int wgetopt_long(int argc, wchar_t **argv, const wchar_t *options, const struct woption *long_options, int *opt_index); + int wgetopt_long_only(int argc, wchar_t **argv, const wchar_t *options, const struct woption *long_options, int *opt_index); }; /** Describe the long-named options requested by the application. |