From 1cab27d2547b15ad0f1054e09bc25a5b2e991369 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 16 May 2008 11:12:48 +0000 Subject: [PATCH] (Ffile_attributes): Shut up GCC warnings about st_uid --- src/ChangeLog | 13 +++++++++++++ src/dired.c | 12 +++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index cff5c24b1fd..795819b75eb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,16 @@ +2008-05-16 Eli Zaretskii + + * dired.c (Ffile_attributes): Shut up GCC warnings about st_uid + and st_gid. + + * frame.c (Fdelete_frame): Don't call font_update_drviers if + HAVE_WINDOW_SYSTEM is not defined. + + * xfaces.c (merge_face_ref, merge_face_vectors) + (Finternal_set_lisp_face_attribute): Use FONT_*_INDEX only when + HAVE_WINDOW_SYSTEM is defined. + (Fface_font): Fix non-HAVE_WINDOW_SYSTEM case. + 2008-05-16 Stefan Monnier * keyboard.c (parse_menu_item): Do not cache key shortcut any more. diff --git a/src/dired.c b/src/dired.c index 6e241338743..7de334bb876 100644 --- a/src/dired.c +++ b/src/dired.c @@ -979,7 +979,7 @@ which see. */) 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 @@ which see. */) #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); -- 2.39.2