Merge pull request #502 from sshedi/pthread-usage-removal

Remove pthread_mutex API usage from TDNF.

client/api.c

@@ -10,7 +10,7 @@
 
 uid_t gEuid;
 
-static TDNF_ENV gEnv = {0};
+static int gInitialized;
 
 static tdnflock instance_lock;
 
@@ -44,44 +44,27 @@ static void IsTdnfAlreadyRunning(void)
 
 uint32_t TDNFInit(void)
 {
-    int nLocked = 0;
     uint32_t dwError = 0;
 
-    pthread_mutex_lock(&gEnv.mutexInitialize);
-    nLocked = 1;
-    if(!gEnv.nInitialized)
+    if (!gInitialized)
     {
         dwError = rpmReadConfigFiles(NULL, NULL);
         BAIL_ON_TDNF_ERROR(dwError);
 
-        gEnv.nInitialized = 1;
+        gInitialized = 1;
     }
 
-cleanup:
-    if(nLocked)
-    {
-        pthread_mutex_unlock(&gEnv.mutexInitialize);
-    }
-    return dwError;
-
 error:
-    goto cleanup;
+    return dwError;
 }
 
-void
-TDNFUninit(
-    void
-    )
+void TDNFUninit(void)
 {
-    pthread_mutex_lock (&gEnv.mutexInitialize);
-
-    if(gEnv.nInitialized)
+    if (gInitialized)
     {
         rpmFreeRpmrc();
+        gInitialized = 0;
     }
-    gEnv.nInitialized = 0;
-
-    pthread_mutex_unlock(&gEnv.mutexInitialize);
 }
 
 //Check all available packages

client/includes.h

@@ -31,7 +31,6 @@
 #include <sys/types.h>
 
 #include <dirent.h>
-#include <pthread.h>
 
 #include "../solv/includes.h"
 

client/structs.h

@@ -51,12 +51,6 @@ typedef struct _TDNF_RPM_TS_
     PTDNF_CACHED_RPM_LIST   pCachedRpmsArray;
 } TDNFRPMTS, *PTDNFRPMTS;
 
-typedef struct _TDNF_ENV_
-{
-    pthread_mutex_t mutexInitialize;
-    int nInitialized;
-} TDNF_ENV, *PTDNF_ENV;
-
 typedef struct _TDNF_REPO_METADATA
 {
     char *pszRepoCacheDir;