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

(Ffile_attributes): Copy some members of `struct stat' into int's to avoid

Browse source 
GCC warnings about limited range of short in arguments to FIXNUM_OVERFLOW_P.
This commit is contained in:
Eli Zaretskii 2007-01-12 15:55:49 +00:00
parent 88f698d97c
commit b55445d6ba
2 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2007-01-12 Eli Zaretskii <eliz@gnu.org>
* dired.c (Ffile_attributes): Copy some members of `struct stat'
into int's to avoid GCC warnings about limited range of short in
arguments to FIXNUM_OVERFLOW_P.
2007-01-12 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* macmenu.c (HAVE_DIALOGS): Define if TARGET_API_MAC_CARBON.

33
src/dired.c
View file

@ -930,6 +930,7 @@ Elements of the attribute list are:
char modes[10];
Lisp_Object handler;
struct gcpro gcpro1;
int uid, gid, ino;
filename = Fexpand_file_name (filename, Qnil);
@ -964,20 +965,26 @@ Elements of the attribute list are:
#endif
}
values[1] = make_number (s.st_nlink);
/* When make_fixnum_or_float is called below with types that are
shorter than an int (e.g., `short'), GCC whines about comparison
being always false due to limited range of data type. Fix by
copying s.st_uid and s.st_gid into int variables. */
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;
pw = (struct passwd *) getpwuid (s.st_uid);
pw = (struct passwd *) getpwuid (uid);
values[2] = (pw ? build_string (pw->pw_name)
: make_fixnum_or_float (s.st_uid));
gr = (struct group *) getgrgid (s.st_gid);
: make_fixnum_or_float (uid));
gr = (struct group *) getgrgid (gid);
values[3] = (gr ? build_string (gr->gr_name)
: make_fixnum_or_float (s.st_gid));
: make_fixnum_or_float (gid));
UNBLOCK_INPUT;
}
values[4] = make_time (s.st_atime);
@ -999,20 +1006,22 @@ Elements of the attribute list are:
if (! NILP (dirname))
encoded = ENCODE_FILE (dirname);
if (! NILP (dirname) && stat (SDATA (encoded), &sdir) == 0)
values[9] = (sdir.st_gid != s.st_gid) ? Qt : Qnil;
values[9] = (sdir.st_gid != gid) ? Qt : Qnil;
else /* if we can't tell, assume worst */
values[9] = Qt;
#else /* file gid will be egid */
values[9] = (s.st_gid != getegid ()) ? Qt : Qnil;
values[9] = (gid != getegid ()) ? Qt : Qnil;
#endif /* BSD4_2 (or BSD4_3) */
if (FIXNUM_OVERFLOW_P (s.st_ino))
/* Shut up GCC warnings in FIXNUM_OVERFLOW_P below. */
ino = s.st_ino;
if (FIXNUM_OVERFLOW_P (ino))
/* To allow inode numbers larger than VALBITS, separate the bottom
16 bits. */
values[10] = Fcons (make_number (s.st_ino >> 16),
make_number (s.st_ino & 0xffff));
values[10] = Fcons (make_number (ino >> 16),
make_number (ino & 0xffff));
else
/* But keep the most common cases as integers. */
values[10] = make_number (s.st_ino);
values[10] = make_number (ino);
/* Likewise for device. */
if (FIXNUM_OVERFLOW_P (s.st_dev))