diff options
author | Panu Matilainen <pmatilai@redhat.com> | 2007-09-26 09:57:26 +0300 |
---|---|---|
committer | Panu Matilainen <pmatilai@redhat.com> | 2007-09-26 09:57:26 +0300 |
commit | 610306fb528b48ce2077b85f0fe90512ef79cc55 (patch) | |
tree | d1a8f1776924e197f6fb01b116208b3922de9f13 /lib/rpmfi.c | |
parent | 0ddf824afb647b620400dba8172fa4ca7ee1690b (diff) | |
download | librpm-tizen-610306fb528b48ce2077b85f0fe90512ef79cc55.tar.gz librpm-tizen-610306fb528b48ce2077b85f0fe90512ef79cc55.tar.bz2 librpm-tizen-610306fb528b48ce2077b85f0fe90512ef79cc55.zip |
Rename whatis() to rpmfiWhatis() for namespacing
Diffstat (limited to 'lib/rpmfi.c')
-rw-r--r-- | lib/rpmfi.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/rpmfi.c b/lib/rpmfi.c index 97a13b082..1a84700a5 100644 --- a/lib/rpmfi.c +++ b/lib/rpmfi.c @@ -436,7 +436,7 @@ const char * ftstring (rpmFileTypes ft) } } -rpmFileTypes whatis(uint_16 mode) +rpmFileTypes rpmfiWhatis(uint_16 mode) { if (S_ISDIR(mode)) return XDIR; if (S_ISCHR(mode)) return CDEV; @@ -449,8 +449,8 @@ rpmFileTypes whatis(uint_16 mode) int rpmfiCompare(const rpmfi afi, const rpmfi bfi) { - rpmFileTypes awhat = whatis(rpmfiFMode(afi)); - rpmFileTypes bwhat = whatis(rpmfiFMode(bfi)); + rpmFileTypes awhat = rpmfiWhatis(rpmfiFMode(afi)); + rpmFileTypes bwhat = rpmfiWhatis(rpmfiFMode(bfi)); if (awhat != bwhat) return 1; @@ -496,9 +496,9 @@ rpmFileAction rpmfiDecideFate(const rpmfi ofi, rpmfi nfi, int skipMissing) } } - diskWhat = whatis((int_16)sb.st_mode); - dbWhat = whatis(rpmfiFMode(ofi)); - newWhat = whatis(rpmfiFMode(nfi)); + diskWhat = rpmfiWhatis((int_16)sb.st_mode); + dbWhat = rpmfiWhatis(rpmfiFMode(ofi)); + newWhat = rpmfiWhatis(rpmfiFMode(nfi)); /* * RPM >= 2.3.10 shouldn't create config directories -- we'll ignore @@ -568,8 +568,8 @@ int rpmfiConfigConflict(const rpmfi fi) return 0; } - diskWhat = whatis((int_16)sb.st_mode); - newWhat = whatis(rpmfiFMode(fi)); + diskWhat = rpmfiWhatis((int_16)sb.st_mode); + newWhat = rpmfiWhatis(rpmfiFMode(fi)); if (newWhat != LINK && newWhat != REG) return 1; @@ -877,7 +877,7 @@ dColors[j] |= fColors[i]; if (j < 0) continue; /* FIX: fModes may be NULL */ - ft = whatis(fModes[i]); + ft = rpmfiWhatis(fModes[i]); /* On install, a relocate to NULL means skip the path. */ if (relocations[j].newPath == NULL) { |