* dired.c (Ffile_attributes): Simplify and avoid #ifdef.

diff --git a/src/ChangeLog b/src/ChangeLog
index 097742c71036a933a0c83e0020eb588be79fd572..8befb78f91fca34dab3daecf8d9fc593fd9399a8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * dired.c (Ffile_attributes): Simplify and avoid #ifdef.
+
 2011-02-22  Wolfgang Jenkner  <wjenkner@inode.at>  (tiny change)
 
        * lread.c (openp): Correct Boolean typo in last commit.

diff --git a/src/dired.c b/src/dired.c
index 92c12846558fbd5db5bee858bb8c2922889a352a..eea4c7cfe407916d3b83caa45b6afc92b4721b4c 100644 (file)
--- a/src/dired.c
+++ b/src/dired.c
@@ -963,17 +963,8 @@ so last access time will always be midnight of that day.  */)
   if (lstat (SSDATA (encoded), &s) < 0)
     return Qnil;
 
-  switch (s.st_mode & S_IFMT)
-    {
-    default:
-      values[0] = Qnil; break;
-    case S_IFDIR:
-      values[0] = Qt; break;
-#ifdef S_IFLNK
-    case S_IFLNK:
-      values[0] = Ffile_symlink_p (filename); break;
-#endif
-    }
+  values[0] = (S_ISLNK (s.st_mode) ? Ffile_symlink_p (filename)
+              : S_ISDIR (s.st_mode) ? Qt : Qnil);
   values[1] = make_number (s.st_nlink);
 
   if (!(NILP (id_format) || EQ (id_format, Qinteger)))