aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--file.c4
-rw-r--r--tfshark.c2
-rw-r--r--tshark.c4
-rw-r--r--ui/capture.c4
-rw-r--r--ui/help_url.c12
-rw-r--r--ui/qt/main.cpp11
-rw-r--r--ui/urls.h5
7 files changed, 19 insertions, 23 deletions
diff --git a/file.c b/file.c
index b43a44183a..2b9389fcdd 100644
--- a/file.c
+++ b/file.c
@@ -635,7 +635,7 @@ cf_read(capture_file *cf, gboolean reloading)
CATCH(OutOfMemoryError) {
simple_message_box(ESD_TYPE_ERROR, NULL,
"More information and workarounds can be found at\n"
- WS_WIKI_URL("KnownBugs/OutOfMemory"),
+ WS_WIKI_HOME_URL "/" "KnownBugs/OutOfMemory",
"Sorry, but Wireshark has run out of memory and has to terminate now.");
#if 0
/* Could we close the current capture and free up memory from that? */
@@ -813,7 +813,7 @@ cf_continue_tail(capture_file *cf, volatile int to_read, wtap_rec *rec,
CATCH(OutOfMemoryError) {
simple_message_box(ESD_TYPE_ERROR, NULL,
"More information and workarounds can be found at\n"
- WS_WIKI_URL("KnownBugs/OutOfMemory"),
+ WS_WIKI_HOME_URL "/" "KnownBugs/OutOfMemory",
"Sorry, but Wireshark has run out of memory and has to terminate now.");
#if 0
/* Could we close the current capture and free up memory from that? */
diff --git a/tfshark.c b/tfshark.c
index 85fafd71fd..3da61c2993 100644
--- a/tfshark.c
+++ b/tfshark.c
@@ -953,7 +953,7 @@ main(int argc, char *argv[])
"Sorry, but TFShark has to terminate now.\n"
"\n"
"Some infos / workarounds can be found at:\n"
- WS_WIKI_URL("KnownBugs/OutOfMemory") "\n");
+ WS_WIKI_HOME_URL "/" "KnownBugs/OutOfMemory" "\n");
success = FALSE;
}
ENDTRY;
diff --git a/tshark.c b/tshark.c
index 7e543d2b92..65e9a2be44 100644
--- a/tshark.c
+++ b/tshark.c
@@ -2069,7 +2069,7 @@ main(int argc, char *argv[])
"Sorry, but TShark has to terminate now.\n"
"\n"
"More information and workarounds can be found at\n"
- WS_WIKI_URL("KnownBugs/OutOfMemory") "\n");
+ WS_WIKI_HOME_URL "/" "KnownBugs/OutOfMemory" "\n");
status = PROCESS_FILE_ERROR;
}
ENDTRY;
@@ -2577,7 +2577,7 @@ capture(void)
"Sorry, but TShark has to terminate now.\n"
"\n"
"More information and workarounds can be found at\n"
- WS_WIKI_URL("KnownBugs/OutOfMemory") "\n");
+ WS_WIKI_HOME_URL "/" "KnownBugs/OutOfMemory" "\n");
abort();
}
ENDTRY;
diff --git a/ui/capture.c b/ui/capture.c
index 22ebc96984..3072b37172 100644
--- a/ui/capture.c
+++ b/ui/capture.c
@@ -269,7 +269,7 @@ capture_input_read_all(capture_session *cap_session, gboolean is_tempfile,
"\n"
"Help about capturing can be found at\n"
"\n"
- " " WS_WIKI_URL("CaptureSetup")
+ " " WS_WIKI_HOME_URL "/" "CaptureSetup"
#ifdef _WIN32
"\n\n"
"Wireless (Wi-Fi/WLAN):\n"
@@ -746,7 +746,7 @@ capture_input_closed(capture_session *cap_session, gchar *msg)
"\n"
"Help about capturing can be found at\n"
"\n"
- " " WS_WIKI_URL("CaptureSetup")
+ " " WS_WIKI_HOME_URL "/" "CaptureSetup"
#ifdef _WIN32
"\n\n"
"Wireless (Wi-Fi/WLAN):\n"
diff --git a/ui/help_url.c b/ui/help_url.c
index f50cfc76b2..31d18c4d67 100644
--- a/ui/help_url.c
+++ b/ui/help_url.c
@@ -102,22 +102,22 @@ topic_action_url(topic_action_e action)
url = g_strdup(WS_Q_AND_A_URL);
break;
case(ONLINEPAGE_SAMPLE_FILES):
- url = g_strdup(WS_WIKI_URL("SampleCaptures"));
+ url = g_strdup(WS_WIKI_HOME_URL "/" "SampleCaptures");
break;
case(ONLINEPAGE_CAPTURE_SETUP):
- url = g_strdup(WS_WIKI_URL("CaptureSetup"));
+ url = g_strdup(WS_WIKI_HOME_URL "/" "CaptureSetup");
break;
case(ONLINEPAGE_NETWORK_MEDIA):
- url = g_strdup(WS_WIKI_URL("CaptureSetup/NetworkMedia"));
+ url = g_strdup(WS_WIKI_HOME_URL "/" "CaptureSetup/NetworkMedia");
break;
case(ONLINEPAGE_SAMPLE_CAPTURES):
- url = g_strdup(WS_WIKI_URL("SampleCaptures"));
+ url = g_strdup(WS_WIKI_HOME_URL "/" "SampleCaptures");
break;
case(ONLINEPAGE_SECURITY):
- url = g_strdup(WS_WIKI_URL("Security"));
+ url = g_strdup(WS_WIKI_HOME_URL "/" "Security");
break;
case(ONLINEPAGE_CHIMNEY):
- url = g_strdup(WS_WIKI_URL("CaptureSetup/Offloading#chimney"));
+ url = g_strdup(WS_WIKI_HOME_URL "/" "CaptureSetup/Offloading#chimney");
break;
/* local manual pages */
diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp
index 1efd285cc1..f767f403b3 100644
--- a/ui/qt/main.cpp
+++ b/ui/qt/main.cpp
@@ -334,11 +334,12 @@ check_and_warn_user_startup()
cur_user = get_cur_username();
cur_group = get_cur_groupname();
simple_message_box(ESD_TYPE_WARN, &recent.privs_warn_if_elevated,
- "Running as user \"%s\" and group \"%s\".\n"
- "This could be dangerous.\n\n"
- "If you're running Wireshark this way in order to perform live capture, "
- "you may want to be aware that there is a better way documented at\n"
- WS_WIKI_URL("CaptureSetup/CapturePrivileges"), cur_user, cur_group);
+ "Running as user \"%s\" and group \"%s\".\n"
+ "This could be dangerous.\n\n"
+ "If you're running Wireshark this way in order to perform live capture, "
+ "you may want to be aware that there is a better way documented at\n"
+ WS_WIKI_HOME_URL "/" "CaptureSetup/CapturePrivileges",
+ cur_user, cur_group);
g_free(cur_user);
g_free(cur_group);
}
diff --git a/ui/urls.h b/ui/urls.h
index 0783090e3e..4d3d9fabad 100644
--- a/ui/urls.h
+++ b/ui/urls.h
@@ -16,8 +16,3 @@
#define WS_FAQ_URL "https://www.wireshark.org/faq.html"
#define WS_Q_AND_A_URL "https://ask.wireshark.org"
#define WS_WIKI_HOME_URL "https://gitlab.com/wireshark/wireshark/-/wikis"
-
-/*
- * Construct a wiki URL given the path to the wiki page.
- */
-#define WS_WIKI_URL(path) WS_WIKI_HOME_URL "/" path
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 10:39:39 +0000