aboutsummaryrefslogtreecommitdiff
path: root/contrib/tzcode
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2025-07-18 17:48:59 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2025-07-18 17:49:34 +0000
commitd63ffdd1ef6368407b35d415237b95cc739d8073 (patch)
tree6b0419583d0197326f724a216c174505b040f7cd /contrib/tzcode
parent655fcdde1aff164a3a02ad073334611117e20d4c (diff)
Diffstat (limited to 'contrib/tzcode')
-rw-r--r--contrib/tzcode/localtime.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/contrib/tzcode/localtime.c b/contrib/tzcode/localtime.c
index f5814a43da54..69b5f0183e2c 100644
--- a/contrib/tzcode/localtime.c
+++ b/contrib/tzcode/localtime.c
@@ -408,10 +408,8 @@ change_in_tz(const char *name)
static char old_name[PATH_MAX];
static struct stat old_sb;
struct stat sb;
- int error;
- error = stat(name, &sb);
- if (error != 0)
+ if (stat(name, &sb) != 0)
return -1;
if (strcmp(name, old_name) != 0) {
@@ -510,13 +508,11 @@ tzloadbody(char const *name, struct state *sp, bool doextend,
* 'doextend' to ignore TZDEFRULES; the change_in_tz()
* function can only keep state for a single file.
*/
- int ret = change_in_tz(name);
- if (ret <= 0) {
- /*
- * Returns an errno value if there was an error,
- * and 0 if the timezone had not changed.
- */
+ switch (change_in_tz(name)) {
+ case -1:
return errno;
+ case 0:
+ return 0;
}
}
fid = _open(name, O_RDONLY | O_BINARY);