osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Move get_copyright_info() to wsutil. 

Change-Id: I75c1c747cd2b4a9845c659636582d54b2caecf1a
Reviewed-on: https://code.wireshark.org/review/2510
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2014-06-21 10:32:12 -07:00
parent 37b903d7ab
commit 43443af0ac
15 changed files with 91 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dumpcap.c
View File

@ -68,6 +68,7 @@
#include <errno.h>
#include <wsutil/crash_info.h>
#include <wsutil/copyright_info.h>
#ifndef HAVE_GETOPT
#include "wsutil/wsgetopt.h"

1
echld/echld-int.h
View File

@ -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"

1
rawshark.c
View File

@ -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>

1
tfshark.c
View File

@ -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>

1
tshark.c
View File

@ -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>

1
ui/gtk/about_dlg.c
View File

@ -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

1
ui/gtk/main.c
View File

@ -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>

1
ui/qt/about_dialog.cpp
View File

@ -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"

1
ui/qt/main.cpp
View File

@ -46,6 +46,7 @@
#endif
#include <wsutil/report_err.h>
#include <wsutil/u3.h>
#include <wsutil/copyright_info.h>
#include <wiretap/merge.h>

12
version_info.c
View File

@ -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.

5
version_info.h
View File

@ -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.

1
wsutil/CMakeLists.txt
View File

@ -44,6 +44,7 @@ set(WSUTIL_FILES
airpdcap_wep.c
base64.c
bitswap.c
copyright_info.c
crash_info.c
crc10.c
crc16.c

2
wsutil/Makefile.common
View File

@ -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 \

37
wsutil/copyright_info.c Normal file
View File

@ -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";
}

42
wsutil/copyright_info.h Normal file
View File

@ -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__ */