Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avoid always passing NULL to printf()-like functions

Browse Source
This commit is contained in:
mrg 2020-09-05 13:35:24 +00:00
parent 42e06d6e82
commit 257335559d
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
external/bsd/libarchive/dist/libarchive/archive_read_open_filename.c vendored
View File

@ -221,7 +221,9 @@ file_open(struct archive *a, void *client_data)
struct read_file_data *mine = (struct read_file_data *)client_data; struct read_file_data *mine = (struct read_file_data *)client_data;
void *buffer; void *buffer;
const char *filename = NULL; const char *filename = NULL;
#if defined(_WIN32) && !defined(__CYGWIN__)
const wchar_t *wfilename = NULL; const wchar_t *wfilename = NULL;
#endif
int fd = -1; int fd = -1;
int is_disk_like = 0; int is_disk_like = 0;
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
@ -281,10 +283,12 @@ file_open(struct archive *a, void *client_data)
#endif #endif
} }
if (fstat(fd, &st) != 0) { if (fstat(fd, &st) != 0) {
#if defined(_WIN32) && !defined(__CYGWIN__)
if (mine->filename_type == FNT_WCS) if (mine->filename_type == FNT_WCS)
archive_set_error(a, errno, "Can't stat '%S'", archive_set_error(a, errno, "Can't stat '%S'",
wfilename); wfilename);
else else
#endif
archive_set_error(a, errno, "Can't stat '%s'", archive_set_error(a, errno, "Can't stat '%s'",
filename); filename);
goto fail; goto fail;