From dbce6217a9ba2e33bf536437393cf6fc4bb4eaa9 Mon Sep 17 00:00:00 2001
From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 15 Sep 2017 11:23:37 -0700
Subject: [PATCH] Stop using deprecated glib APIs in vgauth

Replace some static mutexes with the modern versions.
---
 open-vm-tools/vgauth/common/i18n.c        | 12 ++++++------
 open-vm-tools/vgauth/service/fileLogger.c | 24 +++++++++++------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/open-vm-tools/vgauth/common/i18n.c b/open-vm-tools/vgauth/common/i18n.c
index 262a6aa45..c466009f4 100644
--- a/open-vm-tools/vgauth/common/i18n.c
+++ b/open-vm-tools/vgauth/common/i18n.c
@@ -53,7 +53,7 @@ typedef struct MsgCatalog {
 
 typedef struct MsgState {
    GHashTable *domains;  /* List of text domains. */
-   GStaticMutex lock;    /* Mutex to protect shared state. */
+   GMutex lock;          /* Mutex to protect shared state. */
 } MsgState;
 
 
@@ -368,7 +368,7 @@ MsgInitState(gpointer unused)
 {
    ASSERT(msgState == NULL);
    msgState = g_new0(MsgState, 1);
-   g_static_mutex_init(&msgState->lock);
+   g_mutex_init(&msgState->lock);
    return NULL;
 }
 
@@ -740,9 +740,9 @@ I18n_BindTextDomain(const char *domain,
                    "catalog dir '%s'.\n", domain, lang, catdir);
       }
    } else {
-      g_static_mutex_lock(&state->lock);
+      g_mutex_lock(&state->lock);
       MsgSetCatalog(domain, catalog);
-      g_static_mutex_unlock(&state->lock);
+      g_mutex_unlock(&state->lock);
    }
    g_free(file);
    g_free(usrlang);
@@ -797,7 +797,7 @@ I18n_GetString(const char *domain,
    memcpy(idBuf, idp, len);
    idBuf[len] = '\0';
 
-   g_static_mutex_lock(&state->lock);
+   g_mutex_lock(&state->lock);
 
    catalog = MsgGetCatalog(domain);
    if (catalog != NULL) {
@@ -813,7 +813,7 @@ I18n_GetString(const char *domain,
       }
    }
 
-   g_static_mutex_unlock(&state->lock);
+   g_mutex_unlock(&state->lock);
 
    return strp;
 }
diff --git a/open-vm-tools/vgauth/service/fileLogger.c b/open-vm-tools/vgauth/service/fileLogger.c
index 36f33f298..8e1d3bcb7 100644
--- a/open-vm-tools/vgauth/service/fileLogger.c
+++ b/open-vm-tools/vgauth/service/fileLogger.c
@@ -43,7 +43,7 @@ typedef struct FileLoggerData {
    guint             maxFiles;
    gboolean          append;
    gboolean          error;
-   GStaticRWLock     lock;
+   GRWLock           lock;
 } FileLoggerData;
 
 
@@ -176,7 +176,7 @@ ServiceFileLogger_Log(const gchar *domain,
    gboolean ret = FALSE;
    FileLoggerData *data = (FileLoggerData *) _data;
 
-   g_static_rw_lock_reader_lock(&data->lock);
+   g_rw_lock_reader_lock(&data->lock);
 
    if (data->error) {
       goto exit;
@@ -192,13 +192,13 @@ ServiceFileLogger_Log(const gchar *domain,
           * We need to drop the read lock and acquire a write lock to open
           * the log file.
           */
-         g_static_rw_lock_reader_unlock(&data->lock);
-         g_static_rw_lock_writer_lock(&data->lock);
+         g_rw_lock_reader_unlock(&data->lock);
+         g_rw_lock_writer_lock(&data->lock);
          if (data->file == NULL) {
             data->file = ServiceFileLoggerOpen(data);
          }
-         g_static_rw_lock_writer_unlock(&data->lock);
-         g_static_rw_lock_reader_lock(&data->lock);
+         g_rw_lock_writer_unlock(&data->lock);
+         g_rw_lock_reader_lock(&data->lock);
          if (data->file == NULL) {
             data->error = TRUE;
             fprintf(stderr, "Unable to open log file %s\n", data->path);
@@ -217,15 +217,15 @@ ServiceFileLogger_Log(const gchar *domain,
 #endif
          if (g_atomic_int_get(&data->logSize) >= data->maxSize) {
             /* Drop the reader lock, grab the writer lock and re-check. */
-            g_static_rw_lock_reader_unlock(&data->lock);
-            g_static_rw_lock_writer_lock(&data->lock);
+            g_rw_lock_reader_unlock(&data->lock);
+            g_rw_lock_writer_lock(&data->lock);
             if (g_atomic_int_get(&data->logSize) >= data->maxSize) {
                fclose(data->file);
                data->append = FALSE;
                data->file = ServiceFileLoggerOpen(data);
             }
-            g_static_rw_lock_writer_unlock(&data->lock);
-            g_static_rw_lock_reader_lock(&data->lock);
+            g_rw_lock_writer_unlock(&data->lock);
+            g_rw_lock_reader_lock(&data->lock);
          } else {
             fflush(data->file);
          }
@@ -236,7 +236,7 @@ ServiceFileLogger_Log(const gchar *domain,
    }
 
 exit:
-   g_static_rw_lock_reader_unlock(&data->lock);
+   g_rw_lock_reader_unlock(&data->lock);
    return ret;
 }
 
@@ -300,7 +300,7 @@ ServiceFileLogger_Init(void)
     */
    data->append = TRUE;
 
-   g_static_rw_lock_init(&data->lock);
+   g_rw_lock_init(&data->lock);
 
    if (logFileName != NULL) {
       data->path = g_filename_from_utf8(logFileName, -1, NULL, NULL, NULL);
-- 
2.47.3