Wireshark-commits: [Wireshark-commits] master fe42762: Move some more stuff into wsutil.
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=fe42762f236e23fefe47e67b6c248507d0ac5c8a
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
fe42762 by Guy Harris (guy@xxxxxxxxxxxx):
Move some more stuff into wsutil.
Move the routines to parse numerical command-line arguments there.
Make cmdarg_err() and cmdarg_err_cont() routines in wsutil that just
call routines specified by a call to cmdarg_err_init(), and have
programs supply the appropriate routines to it.
Change-Id: Ic24fc758c0e647f4ff49eb91673529bcb9587b01
Reviewed-on: https://code.wireshark.org/review/2704
Reviewed-by: Evan Huus <eapache@xxxxxxxxx>
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
Actions performed:
from dd63ae2 proto_tree_add_subtree[_format]
adds fe42762 Move some more stuff into wsutil.
Summary of changes:
CMakeLists.txt | 2 --
Makefile.common | 4 ---
capture_opts.c | 4 +--
clopts_common.h | 38 ---------------------
dumpcap.c | 30 +++++++----------
rawshark.c | 26 +++++++--------
tfshark.c | 31 +++++-------------
tshark.c | 32 +++++-------------
ui/gtk/main.c | 23 +++++--------
ui/qt/main.cpp | 22 +++++--------
wsutil/CMakeLists.txt | 2 ++
wsutil/Makefile.common | 6 +++-
clopts_common.c => wsutil/clopts_common.c | 7 ++--
wsutil/{bitswap.h => clopts_common.h} | 16 +++++----
cmdarg_err.h => wsutil/cmdarg_err.c | 51 ++++++++++++++++++++---------
cmdarg_err.h => wsutil/cmdarg_err.h | 25 ++++++++++----
16 files changed, 134 insertions(+), 185 deletions(-)
delete mode 100644 clopts_common.h
rename clopts_common.c => wsutil/clopts_common.c (93%)
copy wsutil/{bitswap.h => clopts_common.h} (74%)
copy cmdarg_err.h => wsutil/cmdarg_err.c (57%)
rename cmdarg_err.h => wsutil/cmdarg_err.h (69%)