* editfns.c (time_overflow): New function, refactoring common code.

(Fformat_time_string, Fdecode_time, Fencode_time):
(Fcurrent_time_string): Use it.

diff --git a/src/ChangeLog b/src/ChangeLog
index 85100149c92f3cbda6d1f12f6e0284deabdd7f0a..a0c4941ec1c1fb65fd3ae71aa9dd5ec00d3490cd 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2011-03-11  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * editfns.c (time_overflow): New function, refactoring common code.
+       (Fformat_time_string, Fdecode_time, Fencode_time):
+       (Fcurrent_time_string): Use it.
+
        Move 'make_time' to be next to its inverse 'lisp_time_argument'.
        * dired.c (make_time): Move to ...
        * editfns.c (make_time): ... here.

diff --git a/src/editfns.c b/src/editfns.c
index ec477f0e0108901aef703a99c79ad7b3471dac0d..fe8541f718e94fa292456ae31ee5834ac3ddd2e6 100644 (file)
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -87,6 +87,7 @@ extern char **environ;
 extern Lisp_Object w32_get_internal_run_time (void);
 #endif
 
+static void time_overflow (void) NO_RETURN;
 static int tm_diff (struct tm *, struct tm *);
 static void find_field (Lisp_Object, Lisp_Object, Lisp_Object,
                        EMACS_INT *, Lisp_Object, EMACS_INT *);
@@ -1476,6 +1477,13 @@ on systems that do not provide resolution finer than a second.  */)
 }
 \f
 
+/* Report a time value that is out of range for Emacs.  */
+static void
+time_overflow (void)
+{
+  error ("Specified time is not representable");
+}
+
 /* Make a Lisp list that represents the time T.  */
 Lisp_Object
 make_time (time_t t)
@@ -1687,7 +1695,7 @@ For example, to produce full ISO 8601 format, use "%Y-%m-%dT%T%z".  */)
   tm = ut ? gmtime (&value) : localtime (&value);
   UNBLOCK_INPUT;
   if (! tm)
-    error ("Specified time is not representable");
+    time_overflow ();
 
   synchronize_system_time_locale ();
 
@@ -1746,7 +1754,7 @@ DOW and ZONE.)  */)
   decoded_time = localtime (&time_spec);
   UNBLOCK_INPUT;
   if (! decoded_time)
-    error ("Specified time is not representable");
+    time_overflow ();
   XSETFASTINT (list_args[0], decoded_time->tm_sec);
   XSETFASTINT (list_args[1], decoded_time->tm_min);
   XSETFASTINT (list_args[2], decoded_time->tm_hour);
@@ -1859,7 +1867,7 @@ usage: (encode-time SECOND MINUTE HOUR DAY MONTH YEAR &optional ZONE)  */)
     }
 
   if (time == (time_t) -1)
-    error ("Specified time is not representable");
+    time_overflow ();
 
   return make_time (time);
 }
@@ -1894,7 +1902,7 @@ but this is considered obsolete.  */)
   tm = localtime (&value);
   UNBLOCK_INPUT;
   if (! (tm && TM_YEAR_IN_ASCTIME_RANGE (tm->tm_year) && (tem = asctime (tm))))
-    error ("Specified time is not representable");
+    time_overflow ();
 
   /* Remove the trailing newline.  */
   tem[strlen (tem) - 1] = '\0';