diff options
| -rw-r--r-- | dumpcap.c | 1 | ||||
| -rw-r--r-- | echld/echld-int.h | 1 | ||||
| -rw-r--r-- | rawshark.c | 1 | ||||
| -rw-r--r-- | tfshark.c | 1 | ||||
| -rw-r--r-- | tshark.c | 1 | ||||
| -rw-r--r-- | ui/gtk/about_dlg.c | 1 | ||||
| -rw-r--r-- | ui/gtk/main.c | 1 | ||||
| -rw-r--r-- | ui/qt/about_dialog.cpp | 1 | ||||
| -rw-r--r-- | ui/qt/main.cpp | 1 | ||||
| -rw-r--r-- | version_info.c | 12 | ||||
| -rw-r--r-- | version_info.h | 5 | ||||
| -rw-r--r-- | wsutil/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | wsutil/Makefile.common | 2 | ||||
| -rw-r--r-- | wsutil/copyright_info.c | 37 | ||||
| -rw-r--r-- | wsutil/copyright_info.h | 42 |
15 files changed, 91 insertions, 17 deletions
@@ -68,6 +68,7 @@ #include <errno.h> #include <wsutil/crash_info.h> +#include <wsutil/copyright_info.h> #ifndef HAVE_GETOPT #include "wsutil/wsgetopt.h" diff --git a/echld/echld-int.h b/echld/echld-int.h index 31466464e4..0e04bc2740 100644 --- a/echld/echld-int.h +++ b/echld/echld-int.h @@ -69,6 +69,7 @@ #include "wsutil/crash_info.h" #include "wsutil/privileges.h" #include "wsutil/filesystem.h" +#include "wsutil/copyright_info.h" #include "epan/epan.h" #include "epan/prefs.h" #include "epan/ex-opt.h" diff --git a/rawshark.c b/rawshark.c index 532ba816eb..48988559e7 100644 --- a/rawshark.c +++ b/rawshark.c @@ -70,6 +70,7 @@ #include <wsutil/filesystem.h> #include <wsutil/plugins.h> #include <wsutil/report_err.h> +#include <wsutil/copyright_info.h> #include "globals.h" #include <epan/packet.h> @@ -64,6 +64,7 @@ #include <wsutil/file_util.h> #include <wsutil/filesystem.h> #include <wsutil/report_err.h> +#include <wsutil/copyright_info.h> #include "globals.h" #include <epan/timestamp.h> @@ -65,6 +65,7 @@ #include <wsutil/file_util.h> #include <wsutil/filesystem.h> #include <wsutil/report_err.h> +#include <wsutil/copyright_info.h> #include "globals.h" #include <epan/timestamp.h> diff --git a/ui/gtk/about_dlg.c b/ui/gtk/about_dlg.c index 844c8f9cf9..904680e5d2 100644 --- a/ui/gtk/about_dlg.c +++ b/ui/gtk/about_dlg.c @@ -29,6 +29,7 @@ #include <wsutil/filesystem.h> #include <wsutil/plugins.h> +#include <wsutil/copyright_info.h> #ifdef HAVE_LIBSMI #include <epan/oids.h> #endif diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 0e05e40256..231d4919a4 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -62,6 +62,7 @@ #include <wsutil/privileges.h> #include <wsutil/report_err.h> #include <wsutil/u3.h> +#include <wsutil/copyright_info.h> #include <wiretap/merge.h> diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp index 9be3ce1336..c0c3fb610c 100644 --- a/ui/qt/about_dialog.cpp +++ b/ui/qt/about_dialog.cpp @@ -50,6 +50,7 @@ #include "wsutil/file_util.h" #include "wsutil/tempfile.h" #include "wsutil/plugins.h" +#include "wsutil/copyright_info.h" #include "qt_ui_utils.h" diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp index f061f77063..20b06ae0c7 100644 --- a/ui/qt/main.cpp +++ b/ui/qt/main.cpp @@ -46,6 +46,7 @@ #endif #include <wsutil/report_err.h> #include <wsutil/u3.h> +#include <wsutil/copyright_info.h> #include <wiretap/merge.h> diff --git a/version_info.c b/version_info.c index 8bc254c099..1e86aaaa31 100644 --- a/version_info.c +++ b/version_info.c @@ -788,18 +788,6 @@ get_runtime_version_info(GString *str, void (*additional_info)(GString *)) end_string(str); } -/* - * Get copyright information. - */ -const char * -get_copyright_info(void) -{ - return -"Copyright 1998-2014 Gerald Combs <gerald@wireshark.org> and contributors.\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"; -} - #if defined(_WIN32) /* * Get the major OS version. diff --git a/version_info.h b/version_info.h index 77cb7af86b..4d9d014a87 100644 --- a/version_info.h +++ b/version_info.h @@ -61,11 +61,6 @@ void get_os_version_info(GString *str); void get_runtime_version_info(GString *str, void (*additional_info)(GString *)); -/* - * Get copyright information. - */ -const char *get_copyright_info(void); - #if defined(_WIN32) /* * Get the major OS version. diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt index 1be0bc0201..2c871b7afb 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt @@ -44,6 +44,7 @@ set(WSUTIL_FILES airpdcap_wep.c base64.c bitswap.c + copyright_info.c crash_info.c crc10.c crc16.c diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common index 3ff030dece..ccf5033e91 100644 --- a/wsutil/Makefile.common +++ b/wsutil/Makefile.common @@ -32,6 +32,7 @@ LIBWSUTIL_SRC = \ airpdcap_wep.c \ base64.c \ bitswap.c \ + copyright_info.c \ crash_info.c \ crc6.c \ crc7.c \ @@ -73,6 +74,7 @@ LIBWSUTIL_INCLUDES = \ bits_ctz.h \ bits_count_ones.h \ bitswap.h \ + copyright_info.h \ crash_info.h \ crc6.h \ crc7.h \ diff --git a/wsutil/copyright_info.c b/wsutil/copyright_info.c new file mode 100644 index 0000000000..f95a584b57 --- /dev/null +++ b/wsutil/copyright_info.c @@ -0,0 +1,37 @@ +/* copyright_info.c + * Routines to report copyright information for stuff used by Wireshark + * + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald@wireshark.org> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "config.h" + +#include <wsutil/copyright_info.h> + +/* + * Get copyright information. + */ +const char * +get_copyright_info(void) +{ + return +"Copyright 1998-2014 Gerald Combs <gerald@wireshark.org> and contributors.\n" +"This is free software; see the source for copying conditions. There is NO\n" +"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"; +} diff --git a/wsutil/copyright_info.h b/wsutil/copyright_info.h new file mode 100644 index 0000000000..73601515f0 --- /dev/null +++ b/wsutil/copyright_info.h @@ -0,0 +1,42 @@ +/* copyright_info.h + * Declarations of outines to report copyright information for stuff used + * by Wireshark + * + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald@wireshark.org> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef __WSUTIL_COPYRIGHT_INFO_H__ +#define __WSUTIL_COPYRIGHT_INFO_H__ + +#include "ws_symbol_export.h" + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +/* + * Get copyright information. + */ +WS_DLL_PUBLIC const char *get_copyright_info(void); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __WSUTIL_COPYRIGHT_INFO_H__ */ |