From: Jim Meyering <jim@meyering.net>
Date: Sat, 13 Jan 2007 18:27:41 +0000 (+0100)
Subject: * src/c99-to-c89.diff: Remove the ls.c patch, now that I've
X-Git-Tag: v6.9.89~337
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3459fe45061e06d00ab652432ca33e15519d90fb;p=platform%2Fupstream%2Fcoreutils.git

* src/c99-to-c89.diff: Remove the ls.c patch, now that I've

temporarily removed the offending c99'ism.
---

diff --git a/ChangeLog-selinux b/ChangeLog-selinux
index fbae67e..d89fb5e 100644
--- a/ChangeLog-selinux
+++ b/ChangeLog-selinux
@@ -1,5 +1,8 @@
 2007-01-13  Jim Meyering  <jim@meyering.net>
 
+	* src/c99-to-c89.diff: Remove the ls.c patch, now that I've
+	temporarily removed the offending c99'ism.
+
 	* src/chcon.c (usage): Split a string literal that was longer than 509.
 
 	* src/ls.c (gobble_file): Don't call getfilecon unless print_scontext.
diff --git a/src/c99-to-c89.diff b/src/c99-to-c89.diff
index efddfad..4e1aa4a 100644
--- a/src/c99-to-c89.diff
+++ b/src/c99-to-c89.diff
@@ -115,23 +115,3 @@ diff -u -p -r1.130 shred.c
  		  if (errnum == EIO && 0 <= size && (soff | SECTOR_MASK) < lim)
  		    {
  		      size_t soff1 = (soff | SECTOR_MASK) + 1;
-diff --git a/src/ls.c b/src/ls.c
-index b1c0f9a..7d51a61 100644
---- a/src/ls.c
-+++ b/src/ls.c
-@@ -2565,6 +2565,7 @@ gobble_file (char const *name, enum filetype type, ino_t inode,
- 				     )))))
-
-     {
-+      bool file_has_security_context = false;
-       /* Absolute name of this file.  */
-       char *absolute_name;
-       bool do_deref;
-@@ -2614,7 +2615,6 @@ gobble_file (char const *name, enum filetype type, ino_t inode,
- 	  break;
- 	}
-
--      bool file_has_security_context = false;
-       if (err == 0 && (format == long_format || print_scontext))
- 	{
- 	  int attr_len = (do_deref