From: Jim Meyering <jim@meyering.net>
Date: Fri, 12 Aug 2005 08:22:47 +0000 (+0000)
Subject: (long_time_expected_width): Don't test for failed localtime.
X-Git-Tag: CPPI-1_12~190
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a3ebcb54dc266d8905d97003bef44d4d82d646b;p=thirdparty%2Fcoreutils.git

(long_time_expected_width): Don't test for failed localtime.
That cannot happen when the result date's year is in range.
Add an assertion instead.
---

diff --git a/src/ls.c b/src/ls.c
index dc01eaeba7..561d7fe526 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -3068,13 +3068,15 @@ long_time_expected_width (void)
       struct tm const *tm = localtime (&epoch);
       char buf[TIME_STAMP_LEN_MAXIMUM + 1];
 
-      if (tm)
-	{
-	  size_t len =
-	    nstrftime (buf, sizeof buf, long_time_format[0], tm, 0, 0);
-	  if (len != 0)
-	    width = mbsnwidth (buf, len, 0);
-	}
+      /* The above use of localtime cannot fail.  */
+      assert (tm != NULL);
+
+      {
+	size_t len =
+	  nstrftime (buf, sizeof buf, long_time_format[0], tm, 0, 0);
+	if (len != 0)
+	  width = mbsnwidth (buf, len, 0);
+      }
 
       if (width < 0)
 	width = 0;