ENH: move changes from main tree to release branch

4 files changed, 19 insertions, 15 deletions

diff --git a/Utilities/cmtar/block.c b/Utilities/cmtar/block.c
index e618d79..430eb20 100644
--- a/Utilities/cmtar/block.c
+++ b/Utilities/cmtar/block.c
@@ -24,7 +24,7 @@
 
 
 /* read a header block */
-int
+static int
 th_read_internal(TAR *t)
 {
   ssize_t i;
diff --git a/Utilities/cmtar/compat/strlcpy.c b/Utilities/cmtar/compat/strlcpy.c
index f85c71b..ee46557 100644
--- a/Utilities/cmtar/compat/strlcpy.c
+++ b/Utilities/cmtar/compat/strlcpy.c
@@ -34,15 +34,14 @@ static char *rcsid = "$OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp
 #include <sys/types.h>
 #include <string.h>
 
+size_t strlcpy(char *dst, const char *src, size_t siz);
+
 /*
  * Copy src to string dst of size siz.  At most siz-1 characters
  * will be copied.  Always NUL terminates (unless siz == 0).
  * Returns strlen(src); if retval >= siz, truncation occurred.
  */
-size_t strlcpy(dst, src, siz)
-  char *dst;
-  const char *src;
-  size_t siz;
+size_t strlcpy(char *dst, const char *src, size_t siz)
 {
   register char *d = dst;
   register const char *s = src;
diff --git a/Utilities/cmtar/libtar.c b/Utilities/cmtar/libtar.c
index fdeccf2..c918e24 100644
--- a/Utilities/cmtar/libtar.c
+++ b/Utilities/cmtar/libtar.c
@@ -83,7 +83,8 @@ struct gzStruct GZStruct;
 #endif
 #endif
 
-int libtar_gzopen(void* call_data, const char *pathname, int oflags, mode_t mode)
+static int libtar_gzopen(void* call_data, const char *pathname,
+  int oflags, mode_t mode)
 {
   char *gzoflags;
   int fd;
@@ -126,19 +127,19 @@ int libtar_gzopen(void* call_data, const char *pathname, int oflags, mode_t mode
   return fd;
 }
 
-int libtar_gzclose(void* call_data)
+static int libtar_gzclose(void* call_data)
 {
   struct gzStruct* gzf = (struct gzStruct*)call_data;
   return cm_zlib_gzclose(gzf->GZFile);
 }
 
-ssize_t libtar_gzread(void* call_data, void* buf, size_t count)
+static ssize_t libtar_gzread(void* call_data, void* buf, size_t count)
 {
   struct gzStruct* gzf = (struct gzStruct*)call_data;
   return cm_zlib_gzread(gzf->GZFile, buf, count);
 }
 
-ssize_t libtar_gzwrite(void* call_data, const void* buf, size_t count)
+static ssize_t libtar_gzwrite(void* call_data, const void* buf, size_t count)
 {
   struct gzStruct* gzf = (struct gzStruct*)call_data;
   return cm_zlib_gzwrite(gzf->GZFile, (void*)buf, count);
@@ -155,7 +156,7 @@ tartype_t gztype = {
 #endif /* HAVE_LIBZ */
 
 
-int
+static int
 create(char *tarfile, char *rootdir, libtar_list_t *l)
 {
   TAR *t;
@@ -212,7 +213,7 @@ create(char *tarfile, char *rootdir, libtar_list_t *l)
 }
 
 
-int
+static int
 list(char *tarfile)
 {
   TAR *t;
@@ -272,7 +273,7 @@ list(char *tarfile)
 }
 
 
-int
+static int
 extract(char *tarfile, char *rootdir)
 {
   TAR *t;
@@ -316,7 +317,7 @@ extract(char *tarfile, char *rootdir)
 }
 
 
-void
+static void
 usage()
 {
   printf("Usage: %s [-C rootdir] [-g] [-z] -x|-t filename.tar\n",
diff --git a/Utilities/cmtar/listhash/list.c.in b/Utilities/cmtar/listhash/list.c.in
index 71c5bf6..bce1e1f 100644
--- a/Utilities/cmtar/listhash/list.c.in
+++ b/Utilities/cmtar/listhash/list.c.in
@@ -414,7 +414,8 @@ int
 /*
 ** @LISTHASH_PREFIX@_list_dup() - copy an existing list
 */
-@LISTHASH_PREFIX@_list_t *
+/*
+static @LISTHASH_PREFIX@_list_t *
 @LISTHASH_PREFIX@_list_dup(@LISTHASH_PREFIX@_list_t *l)
 {
   @LISTHASH_PREFIX@_list_t *newlist;
@@ -429,12 +430,14 @@ int
 #endif
   return newlist;
 }
+*/
 
 
 /*
 ** @LISTHASH_PREFIX@_list_merge() - merge two lists into a new list
 */
-@LISTHASH_PREFIX@_list_t *
+/*
+static @LISTHASH_PREFIX@_list_t *
 @LISTHASH_PREFIX@_list_merge(@LISTHASH_PREFIX@_cmpfunc_t cmpfunc, int flags,
            @LISTHASH_PREFIX@_list_t *list1,
            @LISTHASH_PREFIX@_list_t *list2)
@@ -453,5 +456,6 @@ int
 
   return newlist;
 }
+*/