Make rpmlock type visible inside rpm, use instead of void*

diff --git a/lib/rpmlock.c b/lib/rpmlock.c
index 33208c2..2fe7371 100644 (file)
--- a/lib/rpmlock.c
+++ b/lib/rpmlock.c
@@ -25,10 +25,10 @@ enum {
     RPMLOCK_WAIT   = 1 << 2,
 };
 
-typedef struct {
+struct rpmlock_s {
     int fd;
     int openmode;
-} * rpmlock;
+};
 
 static rpmlock rpmlock_new(const char *rootdir)
 {
@@ -111,7 +111,7 @@ static void rpmlock_release(rpmlock lock)
 
 /* External interface */
 
-void *rpmtsAcquireLock(rpmts ts)
+rpmlock rpmtsAcquireLock(rpmts ts)
 {
     const char *rootDir = rpmtsRootDir(ts);
     rpmlock lock;
@@ -138,10 +138,10 @@ void *rpmtsAcquireLock(rpmts ts)
     return lock;
 }
 
-void rpmtsFreeLock(void *lock)
+void rpmtsFreeLock(rpmlock lock)
 {
-    rpmlock_release((rpmlock)lock); /* Not really needed here. */
-    rpmlock_free((rpmlock)lock);
+    rpmlock_release(lock); /* Not really needed here. */
+    rpmlock_free(lock);
 }
 
 

diff --git a/lib/rpmlock.h b/lib/rpmlock.h
index 7398268..f527c4d 100644 (file)
--- a/lib/rpmlock.h
+++ b/lib/rpmlock.h
@@ -1,7 +1,9 @@
 #ifndef RPMLOCK_H
 #define RPMLOCK_H 
 
-void * rpmtsAcquireLock(rpmts ts);
-void rpmtsFreeLock(void *lock);
+typedef struct rpmlock_s * rpmlock;
+
+rpmlock rpmtsAcquireLock(rpmts ts);
+void rpmtsFreeLock(rpmlock lock);
 
 #endif

diff --git a/lib/rpmts.c b/lib/rpmts.c
index fa36459..aeb472b 100644 (file)
--- a/lib/rpmts.c
+++ b/lib/rpmts.c
@@ -94,7 +94,7 @@ int rpmtsOpenDB(rpmts ts, int dbmode)
 
 int rpmtsInitDB(rpmts ts, int dbmode)
 {
-    void *lock = rpmtsAcquireLock(ts);
+    rpmlock lock = rpmtsAcquireLock(ts);
     int rc = -1;
     if (lock)
            rc = rpmdbInit(ts->rootDir, dbmode);
@@ -123,7 +123,7 @@ int rpmtsSetDBMode(rpmts ts, int dbmode)
 int rpmtsRebuildDB(rpmts ts)
 {
     int rc;
-    void *lock = rpmtsAcquireLock(ts);
+    rpmlock lock = rpmtsAcquireLock(ts);
     if (!lock) return -1;
     if (!(ts->vsflags & RPMVSF_NOHDRCHK))
        rc = rpmdbRebuild(ts->rootDir, ts, headerCheck);

diff --git a/lib/transaction.c b/lib/transaction.c
index 339b4cd..ee91c28 100644 (file)
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -1357,7 +1357,7 @@ static int rpmtsProcess(rpmts ts)
 int rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet)
 {
     int rc = -1; /* assume failure */
-    void * lock = NULL;
+    rpmlock lock = NULL;
     rpmps tsprobs = NULL;
 
     /* XXX programmer error segfault avoidance. */