Add + use helper macro for testing for installed file state

diff --git a/lib/rpmdb.c b/lib/rpmdb.c
index 41c7603..60ebf87 100644 (file)
--- a/lib/rpmdb.c
+++ b/lib/rpmdb.c
@@ -954,8 +954,7 @@ static int rpmdbFindByFile(rpmdb db, dbiIndex dbi, const char *filespec,
 
            if (usestate) {
                rpmtdSetIndex(&fs, num);
-               int s = rpmtdGetNumber(&fs); 
-               if (s != RPMFILE_STATE_NORMAL && s != RPMFILE_STATE_NETSHARED) {
+               if (!RPMFILE_IS_INSTALLED(rpmtdGetNumber(&fs))) {
                    skip = 1;
                }
            }

diff --git a/lib/rpmfi.h b/lib/rpmfi.h
index 3dcf61b..7e95038 100644 (file)
--- a/lib/rpmfi.h
+++ b/lib/rpmfi.h
@@ -43,6 +43,8 @@ typedef enum rpmfileState_e {
     RPMFILE_STATE_WRONGCOLOR   = 4
 } rpmfileState;
 
+#define RPMFILE_IS_INSTALLED(_x) ((_x) == RPMFILE_STATE_NORMAL || (_x) == RPMFILE_STATE_NETSHARED)
+
 /**
  * File Attributes.
  */