[Emacs-diffs] /srv/bzr/emacs/trunk r103390: * dired.c (Ffile_attributes): Simplify and avoid #ifdef.

[Paul Eggert]

------------------------------------------------------------
revno: 103390
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2011-02-22 10:32:51 -0800
message:
  * dired.c (Ffile_attributes): Simplify and avoid #ifdef.
modified:
  src/ChangeLog
  src/dired.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-02-22 18:02:11 +0000
+++ b/src/ChangeLog     2011-02-22 18:32:51 +0000
@@ -1,3 +1,7 @@
+2011-02-22  Paul Eggert  <address@hidden>
+
+       * dired.c (Ffile_attributes): Simplify and avoid #ifdef.
+
 2011-02-22  Wolfgang Jenkner  <address@hidden>  (tiny change)
 
        * lread.c (openp): Correct Boolean typo in last commit.

=== modified file 'src/dired.c'
--- a/src/dired.c       2011-02-22 01:55:20 +0000
+++ b/src/dired.c       2011-02-22 18:32:51 +0000
@@ -963,17 +963,8 @@
   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)))