From: Joerg Sonnenberger <joerg.sonnenberger@gmail.com>
Date: Sun, 7 Mar 2010 18:22:11 +0000 (-0500)
Subject: Merge r1917:
X-Git-Tag: v2.8.2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3ee27b437e07bfee033269fc1307a3eb1609841;p=thirdparty%2Flibarchive.git

Merge r1917:
Do not leak setup_xattr into the global name space.

SVN-Revision: 2022
---

diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
index e3795dec0..80e1d951d 100644
--- a/libarchive/archive_read_disk_entry_from_file.c
+++ b/libarchive/archive_read_disk_entry_from_file.c
@@ -430,11 +430,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)
 {