aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ssl-utils.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2016-04-11 11:31:17 -0700
committerMichael Mann <mmann78@netscape.net>2016-04-13 02:16:20 +0000
commitcf6501eb45408c83467160c8ed026c6aab347642 (patch)
tree84755bcc3bbdb9a1b7dcc69e171ab2f947f0ed0a /epan/dissectors/packet-ssl-utils.c
parentf6b8b4dca5c05f0e6011ca8d8ef670beb911ac39 (diff)
Windows: Remove the need for _CRT_NONSTDC_NO_DEPRECATE.
Replace some function calls with their non-deprecated equivalents so that we can remove _CRT_NONSTDC_NO_DEPRECATE from CMakeLists.txt and config.nmake. Leave _CRT_SECURE_NO_DEPRECATE in place. Removing it failed with 145 warnings and 72 errors. Note that we could probably improve startup performance by using wmem in diam_dict.*. Change-Id: I6e130003de838aebedbdd1aa78c50de8a339ddcb Reviewed-on: https://code.wireshark.org/review/14883 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.c')
-rw-r--r--epan/dissectors/packet-ssl-utils.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c
index b534144eac..29df42fc27 100644
--- a/epan/dissectors/packet-ssl-utils.c
+++ b/epan/dissectors/packet-ssl-utils.c
@@ -3777,7 +3777,7 @@ ssl_load_key(FILE* fp)
gint ret;
guint bytes;
- if (ws_fstat64(fileno(fp), &statbuf) == -1) {
+ if (ws_fstat64(ws_fileno(fp), &statbuf) == -1) {
ssl_debug_printf("ssl_load_key: can't ws_fstat64 file\n");
return NULL;
}
@@ -4655,7 +4655,7 @@ file_needs_reopen(FILE *fp, const char *filename)
/* consider a file deleted when stat fails for either file,
* or when the residing device / inode has changed. */
- if (0 != ws_fstat64(fileno(fp), &open_stat))
+ if (0 != ws_fstat64(ws_fileno(fp), &open_stat))
return TRUE;
if (0 != ws_stat64(filename, &current_stat))
return TRUE;