move off rpm's namespace here. We can't have two functions named\ncpioInstallArchive with different arguments.

3 files changed, 8 insertions, 8 deletions

diff --git a/isys/cpio.c b/isys/cpio.c
index cf8adc8c0..97d411764 100644
--- a/isys/cpio.c
+++ b/isys/cpio.c
@@ -18,7 +18,7 @@ int installCpioFile(gzFile fd, char * cpioName, char * outName, int inWin) {
 	map.mapFlags = CPIO_MAP_PATH;
     }
 
-    rc = cpioInstallArchive(fd, outName ? &map : NULL, 1, NULL, NULL, 
+    rc = myCpioInstallArchive(fd, outName ? &map : NULL, 1, NULL, NULL, 
 			    &failedFile);
 
     if (rc || access(outName, R_OK)) {
diff --git a/isys/cpio.h b/isys/cpio.h
index 07160bd27..460e6c3e1 100644
--- a/isys/cpio.h
+++ b/isys/cpio.h
@@ -67,17 +67,17 @@ typedef void (*cpioCallback)(struct cpioCallbackInfo * filespec, void * data);
    directory. The mode mapping is only used for the permission bits, not
    for the file type. The owner/group mappings are ignored for the nonroot
    user. If *failedFile is non-NULL on return, it should be free()d. */
-int cpioInstallArchive(gzFile stream, struct cpioFileMapping * mappings, 
+int myCpioInstallArchive(gzFile stream, struct cpioFileMapping * mappings, 
 		       int numMappings, cpioCallback cb, void * cbData,
 		       const char ** failedFile);
-int cpioBuildArchive(int fd, struct cpioFileMapping * mappings, 
+int myCpioBuildArchive(int fd, struct cpioFileMapping * mappings, 
 		     int numMappings, cpioCallback cb, void * cbData,
 		     unsigned int * archiveSize, char ** failedFile);
 
 /* This is designed to be qsort/bsearch compatible */
-int cpioFileMapCmp(const void * a, const void * b);
+int myCpioFileMapCmp(const void * a, const void * b);
 
-const char *cpioStrerror(int rc);
+const char *myCpioStrerror(int rc);
 
 int installCpioFile(gzFile fd, char * cpioName, char * outName, int inWin);
 
diff --git a/isys/uncpio.c b/isys/uncpio.c
index e65c4fc82..c7608d70a 100644
--- a/isys/uncpio.c
+++ b/isys/uncpio.c
@@ -469,7 +469,7 @@ static int eatBytes(struct ourfd * fd, int amount) {
     return 0;
 }
 
-int cpioInstallArchive(gzFile stream, struct cpioFileMapping * mappings, 
+int myCpioInstallArchive(gzFile stream, struct cpioFileMapping * mappings, 
 		       int numMappings, cpioCallback cb, void * cbData,
 		       const char ** failedFile) {
     struct cpioHeader ch;
@@ -792,7 +792,7 @@ static int writeLinkedFile(int fd, struct hardLink * hlink,
     return 0;
 }
 
-int cpioBuildArchive(int fd, struct cpioFileMapping * mappings, 
+int myCpioBuildArchive(int fd, struct cpioFileMapping * mappings, 
 		     int numMappings, cpioCallback cb, void * cbData,
 		     unsigned int * archiveSize, char ** failedFile) {
     size_t size, totalsize = 0;
@@ -900,7 +900,7 @@ int cpioBuildArchive(int fd, struct cpioFileMapping * mappings,
     return 0;
 }
 
-const char * cpioStrerror(int rc)
+const char * myCpioStrerror(int rc)
 {
     static char msg[256];
     char *s;