From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 23 Jun 2012 16:44:45 +0000 (-0700)
Subject: * sysdep.c [__FreeBSD__]: Fix more recently-introduced typos.
X-Git-Tag: emacs-24.2.90~1199^2~380
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=db7b8d066d675f326a9f2cce7dfd54fbbbeb88a0;p=emacs.git

* sysdep.c [__FreeBSD__]: Fix more recently-introduced typos.

Privately reported by Herbert J. Skuhra.
(make_lisp_timeval) [__FreeBSD__]: Rename from TIMELIST.
All uses changed.
(system_process_attributes) [__FreeBSD__]: Invoke make_lisp_time,
not make_lisp_timeval, when the argument is of type EMACS_TIME.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index b23e92057b0..223d9c4bd13 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2012-06-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* sysdep.c [__FreeBSD__]: Fix more recently-introduced typos.
+	Privately reported by Herbert J. Skuhra.
+	(make_lisp_timeval) [__FreeBSD__]: Rename from TIMELIST.
+	All uses changed.
+	(system_process_attributes) [__FreeBSD__]: Invoke make_lisp_time,
+	not make_lisp_timeval, when the argument is of type EMACS_TIME.
+
 2012-06-23  Eli Zaretskii  <eliz@gnu.org>
 
 	* w32proc.c (Fw32_get_locale_info): Fix an off-by-one error in
diff --git a/src/sysdep.c b/src/sysdep.c
index 875f343135e..42f53a75e9d 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -3116,7 +3116,7 @@ timeval_to_EMACS_TIME (struct timeval t)
 }
 
 static Lisp_Object
-TIMELIST (struct timeval t)
+make_lisp_timeval (struct timeval t)
 {
   return make_lisp_time (timeval_to_EMACS_TIME (t));
 }
@@ -3216,32 +3216,38 @@ system_process_attributes (Lisp_Object pid)
   attrs = Fcons (Fcons (Qcminflt, make_number (proc.ki_rusage_ch.ru_minflt)), attrs);
   attrs = Fcons (Fcons (Qcmajflt, make_number (proc.ki_rusage_ch.ru_majflt)), attrs);
 
-  attrs = Fcons (Fcons (Qutime, TIMELIST (proc.ki_rusage.ru_utime)), attrs);
-  attrs = Fcons (Fcons (Qstime, TIMELIST (proc.ki_rusage.ru_stime)), attrs);
+  attrs = Fcons (Fcons (Qutime, make_lisp_timeval (proc.ki_rusage.ru_utime)),
+		 attrs);
+  attrs = Fcons (Fcons (Qstime, make_lisp_timeval (proc.ki_rusage.ru_stime)),
+		 attrs);
   EMACS_ADD_TIME (t,
 		  timeval_to_EMACS_TIME (proc.ki_rusage.ru_utime),
 		  timeval_to_EMACS_TIME (proc.ki_rusage.ru_stime));
-  attrs = Fcons (Fcons (Qtime,  TIMELIST (t)), attrs);
+  attrs = Fcons (Fcons (Qtime, make_lisp_time (t)), attrs);
 
-  attrs = Fcons (Fcons (Qcutime, TIMELIST (proc.ki_rusage_ch.ru_utime)), attrs);
-  attrs = Fcons (Fcons (Qcstime, TIMELIST (proc.ki_rusage_ch.ru_utime)), attrs);
+  attrs = Fcons (Fcons (Qcutime,
+			make_lisp_timeval (proc.ki_rusage_ch.ru_utime)),
+		 attrs);
+  attrs = Fcons (Fcons (Qcstime,
+			make_lisp_timeval (proc.ki_rusage_ch.ru_utime)),
+		 attrs);
   EMACS_ADD_TIME (t,
 		  timeval_to_EMACS_TIME (proc.ki_rusage_ch.ru_utime),
 		  timeval_to_EMACS_TIME (proc.ki_rusage_ch.ru_stime));
-  attrs = Fcons (Fcons (Qctime, TIMELIST (t)), attrs);
+  attrs = Fcons (Fcons (Qctime, make_lisp_time (t)), attrs);
 
   attrs = Fcons (Fcons (Qthcount, make_fixnum_or_float (proc.ki_numthreads)),
 		 attrs);
   attrs = Fcons (Fcons (Qpri,   make_number (proc.ki_pri.pri_native)), attrs);
   attrs = Fcons (Fcons (Qnice,  make_number (proc.ki_nice)), attrs);
-  attrs = Fcons (Fcons (Qstart, TIMELIST (proc.ki_start)), attrs);
+  attrs = Fcons (Fcons (Qstart, make_lisp_timeval (proc.ki_start)), attrs);
   attrs = Fcons (Fcons (Qvsize, make_number (proc.ki_size >> 10)), attrs);
   attrs = Fcons (Fcons (Qrss,   make_number (proc.ki_rssize * pagesize >> 10)),
 		 attrs);
 
   EMACS_GET_TIME (now);
   EMACS_SUB_TIME (t, now, timeval_to_EMACS_TIME (proc.ki_start));
-  attrs = Fcons (Fcons (Qetime, TIMELIST (t)), attrs);
+  attrs = Fcons (Fcons (Qetime, make_lisp_time (t)), attrs);
 
   len = sizeof fscale;
   if (sysctlbyname ("kern.fscale", &fscale, &len, NULL, 0) == 0)