projects
/
runtime.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Accept silc_file_stat and silc_file_fstat with the stat struct as NULL
[runtime.git]
/
lib
/
silcutil
/
silcfileutil.c
diff --git
a/lib/silcutil/silcfileutil.c
b/lib/silcutil/silcfileutil.c
index e21da72db217e0040b8c34001ca5b5b19c5b7af0..12e9f203a9f78b02c425c4e6126025c128a1195b 100644
(file)
--- a/
lib/silcutil/silcfileutil.c
+++ b/
lib/silcutil/silcfileutil.c
@@
-303,7
+303,7
@@
SilcBool silc_file_stat(const char *filename, SilcBool follow_symlinks,
{
struct stat status;
{
struct stat status;
- if (silc_unlikely(!filename
|| !return_stat
)) {
+ if (silc_unlikely(!filename)) {
silc_set_errno(SILC_ERR_INVALID_ARGUMENT);
return FALSE;
}
silc_set_errno(SILC_ERR_INVALID_ARGUMENT);
return FALSE;
}
@@
-329,7
+329,8
@@
SilcBool silc_file_stat(const char *filename, SilcBool follow_symlinks,
#endif /* HAVE_LSTAT */
}
#endif /* HAVE_LSTAT */
}
- silc_file_fill_stat(&status, return_stat);
+ if (return_stat)
+ silc_file_fill_stat(&status, return_stat);
return TRUE;
}
return TRUE;
}
@@
-340,17
+341,13
@@
SilcBool silc_file_fstat(int fd, SilcFileStat return_stat)
{
struct stat status;
{
struct stat status;
- if (silc_unlikely(!return_stat)) {
- silc_set_errno(SILC_ERR_INVALID_ARGUMENT);
- return FALSE;
- }
-
if (silc_unlikely(fstat(fd, &status) != 0)) {
silc_set_errno_posix(errno);
return FALSE;
}
if (silc_unlikely(fstat(fd, &status) != 0)) {
silc_set_errno_posix(errno);
return FALSE;
}
- silc_file_fill_stat(&status, return_stat);
+ if (return_stat)
+ silc_file_fill_stat(&status, return_stat);
return TRUE;
}
return TRUE;
}