gbranden pushed a commit to branch master
in repository groff.
commit 43d928a97cf348ebece1ca79b9789d5777032b9f
Author: Alejandro Colomar <[email protected]>
AuthorDate: Sat Mar 16 13:34:33 2024 +0100
[libgroff]: Drop some checks from current_time().
* src/libs/libgroff/curtime.cpp (current_time): Remove redundant checks.
ERANGE can only happen if strtol(3) returns either LONG_MIN or
LONG_MAX.
Fixes: e4290210f2c1 ("Implement `SOURCE_DATE_EPOCH' for reproducible
builds.")
Link: <https://savannah.gnu.org/bugs/?65451>
Cc: "G. Branden Robinson" <[email protected]>
Cc: Dave Kemper <[email protected]>
Cc: "James K. Lowden" <[email protected]>
Cc: Colin Watson <[email protected]>
Cc: Werner LEMBERG <[email protected]>
Cc: James Clark <[email protected]>
Signed-off-by: Alejandro Colomar <[email protected]>
---
ChangeLog | 6 ++++++
src/libs/libgroff/curtime.cpp | 3 +--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e2dc10c71..df2566703 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-03-16 Alejandro Colomar <[email protected]>
+
+ * src/libs/libgroff/curtime.cpp (current_time): Remove redundant
+ checks. ERANGE can only happen if strtol(3) returns either
+ LONG_MIN or LONG_MAX.
+
2024-07-12 G. Branden Robinson <[email protected]>
[nroff]: Support argument clustering.
diff --git a/src/libs/libgroff/curtime.cpp b/src/libs/libgroff/curtime.cpp
index 277755cab..490fc3018 100644
--- a/src/libs/libgroff/curtime.cpp
+++ b/src/libs/libgroff/curtime.cpp
@@ -42,8 +42,7 @@ struct tm *current_time()
char *endptr;
long epoch = strtol(source_date_epoch, &endptr, 10);
- if ((errno == ERANGE && (epoch == LONG_MAX || epoch == LONG_MIN)) ||
- (errno != 0 && epoch == 0))
+ if ((errno == ERANGE) || (errno != 0 && epoch == 0))
fatal("$SOURCE_DATE_EPOCH: strtol: %1", strerror(errno));
if (endptr == source_date_epoch)
fatal("$SOURCE_DATE_EPOCH: no digits found: '%1'", endptr);
_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
