aboutsummaryrefslogtreecommitdiffstats
path: root/wsutil
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2016-06-15 13:42:56 -0700
committerPascal Quantin <pascal.quantin@gmail.com>2016-06-16 01:59:15 +0000
commit60578aa16f4f27d37ea0a90e964c58cc1dc22953 (patch)
tree8d905a209ae170e5065ffcd0a819178dd658704a /wsutil
parentb2c7e8eb013336f3ec28d374a6e1e7cd6abfb234 (diff)
file_util.c: do not search in Npcap installation folder when calling ws_load_library()
ws_load_library() is not used to load packet.dll or wpcap.dll (we use ws_module_open() for this). Let's not lose time checking the folder content. Change-Id: Ibd4a71b8b0c5ffc0c4c146eca51ad9f20964515b Reviewed-on: https://code.wireshark.org/review/15938 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'wsutil')
-rw-r--r--wsutil/file_util.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/wsutil/file_util.c b/wsutil/file_util.c
index da8f91487c..a5cd62fdb7 100644
--- a/wsutil/file_util.c
+++ b/wsutil/file_util.c
@@ -575,19 +575,6 @@ ws_load_library(const gchar *library_name)
}
}
- /* At last try the Npcap directory */
- full_path = g_module_build_path(npcap_path, library_name);
- full_path_w = g_utf8_to_utf16(full_path, -1, NULL, NULL, NULL);
-
- if (full_path && full_path_w) {
- dll_h = LoadLibraryW(full_path_w);
- if (dll_h) {
- g_free(full_path);
- g_free(full_path_w);
- return dll_h;
- }
- }
-
return NULL;
}