procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(Ffile_attributes): Shut up GCC warnings about st_uid

Browse source
This commit is contained in:
Eli Zaretskii 2008-05-16 11:12:48 +00:00
parent 1ccdfd3359
commit 1cab27d254
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/ChangeLog
View file

@ -1,3 +1,16 @@
2008-05-16 Eli Zaretskii <eliz@gnu.org>
* 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 <monnier@iro.umontreal.ca>
* keyboard.c (parse_menu_item): Do not cache key shortcut any more.

12
src/dired.c
View file

@ -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);