git.samba.org
/
obnox
/
wireshark
/
wip.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From Harald Welte:
[obnox/wireshark/wip.git]
/
version_info.c
diff --git
a/version_info.c
b/version_info.c
index 8435bb019d75417de49ebbfb8ee173dfa7a91e84..887b9836dc944aa811cd1bc5f12c0f3828aab417 100644
(file)
--- a/
version_info.c
+++ b/
version_info.c
@@
-26,10
+26,6
@@
# include "config.h"
#endif
# include "config.h"
#endif
-#ifdef HAVE_PYTHON
-#include <Python.h> /* to get the Python version number (PY_VERSION) */
-#endif
-
#include <glib.h>
#include <stdlib.h>
#include <glib.h>
#include <stdlib.h>
@@
-41,10
+37,6
@@
#include <zlib.h> /* to get the libz version number */
#endif
#include <zlib.h> /* to get the libz version number */
#endif
-#ifdef HAVE_LIBPCRE
-#include <pcre.h> /* to get the libpcre version number */
-#endif /* HAVE_LIBPCRE */
-
#ifdef HAVE_SYS_UTSNAME_H
#include <sys/utsname.h>
#endif
#ifdef HAVE_SYS_UTSNAME_H
#include <sys/utsname.h>
#endif
@@
-67,10
+59,6
@@
# include <sys/capability.h>
#endif
# include <sys/capability.h>
#endif
-#ifdef HAVE_GEOIP
-#include <epan/geoip_db.h>
-#endif
-
#ifdef SVNVERSION
const char *wireshark_svnversion = " (" SVNVERSION " from " SVNPATH ")";
#else
#ifdef SVNVERSION
const char *wireshark_svnversion = " (" SVNVERSION " from " SVNPATH ")";
#else
@@
-171,12
+159,6
@@
get_compiled_version_info(GString *str, void (*prepend_info)(GString *),
(*append_info)(str);
g_string_append(str, ".");
(*append_info)(str);
g_string_append(str, ".");
-#if !defined(HAVE_LIBPCRE) && !GLIB_CHECK_VERSION(2,14,0)
- g_string_append(str,
- "\nNOTE: this build doesn't support the \"matches\" operator for Wireshark filter syntax");
- g_string_append(str, ".");
-#endif /* HAVE_LIBPCRE */
-
end_string(str);
}
end_string(str);
}
@@
-201,6
+183,9
@@
get_runtime_version_info(GString *str, void (*additional_info)(GString *))
#if HAVE_OS_X_FRAMEWORKS
SInt32 macosx_ver, macosx_major_ver, macosx_minor_ver, macosx_bugfix_ver;
#endif
#if HAVE_OS_X_FRAMEWORKS
SInt32 macosx_ver, macosx_major_ver, macosx_minor_ver, macosx_bugfix_ver;
#endif
+#ifndef _WIN32
+ gchar *lang;
+#endif
g_string_append(str, "on ");
g_string_append(str, "on ");
@@
-371,7
+356,7
@@
get_runtime_version_info(GString *str, void (*additional_info)(GString *))
*/
if (uname(&name) < 0) {
g_string_append_printf(str, "unknown OS version (uname failed - %s)",
*/
if (uname(&name) < 0) {
g_string_append_printf(str, "unknown OS version (uname failed - %s)",
- strerror(errno));
+
g_
strerror(errno));
return;
}
return;
}
@@
-485,6
+470,14
@@
get_runtime_version_info(GString *str, void (*additional_info)(GString *))
g_string_append(str, "an unknown OS");
#endif
g_string_append(str, "an unknown OS");
#endif
+#ifndef _WIN32
+ /* Locale */
+ if ((lang = getenv ("LANG")) != NULL)
+ g_string_append_printf(str, ", with locale %s", lang);
+ else
+ g_string_append(str, ", without locale");
+#endif
+
/* Libpcap */
g_string_append(str, ", ");
get_runtime_pcap_version(str);
/* Libpcap */
g_string_append(str, ", ");
get_runtime_pcap_version(str);
@@
-503,16
+496,20
@@
get_runtime_version_info(GString *str, void (*additional_info)(GString *))
/* Compiler info */
/*
/* Compiler info */
/*
- * See http
://predef.sourceforge.net/precomp.html for
+ * See http
s://sourceforge.net/apps/mediawiki/predef/index.php?title=Compilers
* information on various defined strings.
*
* GCC's __VERSION__ is a nice text string for humans to
* information on various defined strings.
*
* GCC's __VERSION__ is a nice text string for humans to
- * read. The page at
predef.sourceforge.net largely
- *
describes numeric #defines that encode the version;
- *
if the compiler doesn't also offer a nice printable
- *
string, we should probably prettify
the number somehow.
+ * read. The page at
sourceforge.net largely describes
+ *
numeric #defines that encode the version; if the compiler
+ *
doesn't also offer a nice printable string, we try prettifying
+ * the number somehow.
*/
#if defined(__GNUC__) && defined(__VERSION__)
*/
#if defined(__GNUC__) && defined(__VERSION__)
+ /*
+ * Clang and llvm-gcc also define __GNUC__ and __VERSION__;
+ * distinguish between them.
+ */
#if defined(__clang__)
g_string_append_printf(str, "\n\nBuilt using clang %s.\n", __VERSION__);
#elif defined(__llvm__)
#if defined(__clang__)
g_string_append_printf(str, "\n\nBuilt using clang %s.\n", __VERSION__);
#elif defined(__llvm__)
@@
-583,7
+580,7
@@
const char *
get_copyright_info(void)
{
return
get_copyright_info(void)
{
return
-"Copyright 1998-201
1
Gerald Combs <gerald@wireshark.org> and contributors.\n"
+"Copyright 1998-201
2
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";
}
"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";
}
@@
-614,6
+611,6
@@
get_os_major_version()
* indent-tabs-mode: t
* End:
*
* indent-tabs-mode: t
* End:
*
- * ex: set shiftwidth=8 tabstop=8 noexpandtab
+ * ex: set shiftwidth=8 tabstop=8 noexpandtab
:
* :indentSize=8:tabSize=8:noTabs=false:
*/
* :indentSize=8:tabSize=8:noTabs=false:
*/