Rename fileTypes(_e) to rpmFileTypes for namespacing

diff --git a/lib/rpmfi.c b/lib/rpmfi.c
index dfbc123..7215711 100644 (file)
--- a/lib/rpmfi.c
+++ b/lib/rpmfi.c
@@ -422,7 +422,7 @@ rpmfi rpmfiInitD(rpmfi fi, int dx)
  * @return             string to identify a file type
  */
 static
-const char * ftstring (fileTypes ft)
+const char * ftstring (rpmFileTypes ft)
 {
     switch (ft) {
     case XDIR: return "directory";
@@ -436,7 +436,7 @@ const char * ftstring (fileTypes ft)
     }
 }
 
-fileTypes whatis(uint_16 mode)
+rpmFileTypes whatis(uint_16 mode)
 {
     if (S_ISDIR(mode)) return XDIR;
     if (S_ISCHR(mode)) return CDEV;
@@ -449,8 +449,8 @@ fileTypes whatis(uint_16 mode)
 
 int rpmfiCompare(const rpmfi afi, const rpmfi bfi)
 {
-    fileTypes awhat = whatis(rpmfiFMode(afi));
-    fileTypes bwhat = whatis(rpmfiFMode(bfi));
+    rpmFileTypes awhat = whatis(rpmfiFMode(afi));
+    rpmFileTypes bwhat = whatis(rpmfiFMode(bfi));
 
     if (awhat != bwhat) return 1;
 
@@ -478,7 +478,7 @@ fileAction rpmfiDecideFate(const rpmfi ofi, rpmfi nfi, int skipMissing)
     const char * fn = rpmfiFN(nfi);
     int newFlags = rpmfiFFlags(nfi);
     char buffer[1024];
-    fileTypes dbWhat, newWhat, diskWhat;
+    rpmFileTypes dbWhat, newWhat, diskWhat;
     struct stat sb;
     int save = (newFlags & RPMFILE_NOREPLACE) ? FA_ALTNAME : FA_SAVE;
 
@@ -561,7 +561,7 @@ int rpmfiConfigConflict(const rpmfi fi)
     const char * fn = rpmfiFN(fi);
     int flags = rpmfiFFlags(fi);
     char buffer[1024];
-    fileTypes newWhat, diskWhat;
+    rpmFileTypes newWhat, diskWhat;
     struct stat sb;
 
     if (!(flags & RPMFILE_CONFIG) || lstat(fn, &sb)) {
@@ -825,7 +825,7 @@ assert(p != NULL);
     /* Relocate individual paths. */
 
     for (i = fileCount - 1; i >= 0; i--) {
-       fileTypes ft;
+       rpmFileTypes ft;
        int fnlen;
 
        len = reldel +

diff --git a/lib/rpmfi.h b/lib/rpmfi.h
index 4251b84..345a50f 100644 (file)
--- a/lib/rpmfi.h
+++ b/lib/rpmfi.h
@@ -449,7 +449,7 @@ void rpmfiBuildFDeps(Header h, rpmTag tagN,
  * @param mode         file mode bits (from header)
  * @return             file type
  */
-fileTypes whatis(uint_16 mode);
+rpmFileTypes whatis(uint_16 mode);
 
 /**
  * Return file info comparison.

diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index b1afd48..a574bf8 100644 (file)
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -787,7 +787,7 @@ typedef enum fileAction_e {
  * the file mode tag from a header. The values are arbitrary,
  * but are identical to the linux stat(2) file types.
  */
-typedef enum fileTypes_e {
+typedef enum rpmFileTypes_e {
     PIPE       =  1,   /*!< pipe/fifo */
     CDEV       =  2,   /*!< character device */
     XDIR       =  4,   /*!< directory */
@@ -795,7 +795,7 @@ typedef enum fileTypes_e {
     REG                =  8,   /*!< regular file */
     LINK       = 10,   /*!< hard link */
     SOCK       = 12    /*!< socket */
-} fileTypes;
+} rpmFileTypes;
 
 /** \ingroup payload
  * Iterator across package file info, forward on install, backward on erase.