diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-04-11 11:31:17 -0700 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-04-13 02:16:20 +0000 |
| commit | cf6501eb45408c83467160c8ed026c6aab347642 (patch) | |
| tree | 84755bcc3bbdb9a1b7dcc69e171ab2f947f0ed0a /wiretap | |
| parent | f6b8b4dca5c05f0e6011ca8d8ef670beb911ac39 (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 'wiretap')
| -rw-r--r-- | wiretap/file_access.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/file_access.c b/wiretap/file_access.c index 146715d48f..03f2e7ed52 100644 --- a/wiretap/file_access.c +++ b/wiretap/file_access.c @@ -2283,7 +2283,7 @@ wtap_dump_open_tempfile_ng(char **filenamep, const char *pfx, fh = wtap_dump_file_fdopen(wdh, fd); if (fh == NULL) { *err = errno; - close(fd); + ws_close(fd); g_free(wdh); return NULL; /* can't create file */ } @@ -2461,7 +2461,7 @@ wtap_dump_open_finish(wtap_dumper *wdh, int file_type_subtype, gboolean compress if(compressed) { cant_seek = TRUE; } else { - fd = fileno((FILE *)wdh->fh); + fd = ws_fileno((FILE *)wdh->fh); if (ws_lseek64(fd, 1, SEEK_CUR) == (off_t) -1) cant_seek = TRUE; else { |