Mercurial > emacs

changeset 95045:dee9cd027812

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Ffile_attributes): Shut up GCC warnings about st_uid
author Eli Zaretskii <eliz@gnu.org>
date Fri, 16 May 2008 11:11:31 +0000
parents f4fac6175e87
children 0ec0130d17e7
files src/dired.c
diffstat 1 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/dired.c	Fri May 16 11:10:16 2008 +0000
+++ b/src/dired.c	Fri May 16 11:11:31 2008 +0000
@@ -979,7 +979,7 @@
   char modes[10];
   Lisp_Object handler;
   struct gcpro gcpro1;
-  EMACS_INT ino;
+  EMACS_INT ino, uid, gid;
   char *uname, *gname;
 
   filename = Fexpand_file_name (filename, Qnil);
@@ -1015,20 +1015,22 @@
 #endif
     }
   values[1] = make_number (s.st_nlink);
+  uid = s.st_uid;
+  gid = s.st_gid;
   if (NILP (id_format) || EQ (id_format, Qinteger))
     {
-      values[2] = make_fixnum_or_float (s.st_uid);
-      values[3] = make_fixnum_or_float (s.st_gid);
+      values[2] = make_fixnum_or_float (uid);
+      values[3] = make_fixnum_or_float (gid);
     }
   else
     {
       BLOCK_INPUT;
       uname = stat_uname (&s);
       values[2] = (uname ? build_string (uname)
-		   : make_fixnum_or_float (s.st_uid));
+		   : make_fixnum_or_float (uid));
       gname = stat_gname (&s);
       values[3] = (gname ? build_string (gname)
-		   : make_fixnum_or_float (s.st_gid));
+		   : make_fixnum_or_float (gid));
       UNBLOCK_INPUT;
     }
   values[4] = make_time (s.st_atime);