summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido Vranken <guidovranken@gmail.com>2017-02-11 22:41:38 +0100
committerRich Salz <rsalz@openssl.org>2017-02-14 15:00:09 -0500
commit07bc93f479bb73567b23ceb6c2d96e7cc511edd3 (patch)
tree3ee1aa3d5d9d1a9f5fc42aaac6ad6e9998cfb73c
parent177b4225baac56336e04fd97d0c993fd45d3e45e (diff)
Remove obsolete comment
Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1613) (cherry picked from commit 7c120357e5ef434c8a7d1d1c3ba4f2a33266374e)
-rwxr-xr-xcrypto/o_time.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/crypto/o_time.c b/crypto/o_time.c
index e785525b3f..4b902e09ac 100755
--- a/crypto/o_time.c
+++ b/crypto/o_time.c
@@ -52,11 +52,8 @@ struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *result)
struct tm *ts = NULL;
#if defined(OPENSSL_THREADS) && !defined(OPENSSL_SYS_WIN32) && (!defined(OPENSSL_SYS_VMS) || defined(gmtime_r)) && !defined(OPENSSL_SYS_MACOSX)
- /*
- * should return &data, but doesn't on some systems, so we don't even
- * look at the return value
- */
- gmtime_r(timer, result);
+ if (gmtime_r(timer, result) == NULL)
+ return NULL;
ts = result;
#elif !defined(OPENSSL_SYS_VMS) || defined(VMS_GMTIME_OK)
ts = gmtime(timer);