From: Joerg Sonnenberger <joerg.sonnenberger@gmail.com>
Date: Sat, 20 Feb 2010 00:20:25 +0000 (-0500)
Subject: Do not leak setup_xattr into the global name space.
X-Git-Tag: v3.0.0a~1246
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6886dab08e63b0874e34926360ff18928feffdec;p=thirdparty%2Flibarchive.git

Do not leak setup_xattr into the global name space.

SVN-Revision: 1917
---

diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
index 0c7d3fc07..62ac67127 100644
--- a/libarchive/archive_read_disk_entry_from_file.c
+++ b/libarchive/archive_read_disk_entry_from_file.c
@@ -454,11 +454,11 @@ setup_xattrs(struct archive_read_disk *a,
  * to not include the system extattrs that hold ACLs; we handle
  * those separately.
  */
-int
+static int
 setup_xattr(struct archive_read_disk *a, struct archive_entry *entry,
     int namespace, const char *name, const char *fullname, int fd);
 
-int
+static int
 setup_xattr(struct archive_read_disk *a, struct archive_entry *entry,
     int namespace, const char *name, const char *fullname, int fd)
 {