From 7555ebc629774b95a878678f8ab0946c3bcf2f32 Mon Sep 17 00:00:00 2001
From: Dmitry Antipov <dmantipov@yandex.ru>
Date: Fri, 27 Dec 2019 13:35:33 +0300
Subject: cli, libglusterfs: rely on libpthread static initializers

cli-cmd.c: drop cli_cmd_cond_init() because static mutex and
condition variable are initialized with PTHREAD_xxx_INITIALIZERs.

syncop-utils.c: since assignment PTHREAD_xxx_INITIALIZERs are
never failed, a few overengineered bits may be simplified.

Change-Id: Ic4d250a1697047386989f73f058b0abc8b55627b
Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
Updates: bz#1193929
---
 cli/src/cli-cmd.c | 12 ------------
 cli/src/cli-cmd.h |  3 ---
 cli/src/cli.c     |  4 ----
 3 files changed, 19 deletions(-)

(limited to 'cli')

diff --git a/cli/src/cli-cmd.c b/cli/src/cli-cmd.c
index c8a84475b5..af009757e9 100644
--- a/cli/src/cli-cmd.c
+++ b/cli/src/cli-cmd.c
@@ -231,18 +231,6 @@ out:
     return ret;
 }
 
-int
-cli_cmd_cond_init()
-{
-    pthread_mutex_init(&cond_mutex, NULL);
-    pthread_cond_init(&cond, NULL);
-
-    pthread_mutex_init(&conn_mutex, NULL);
-    pthread_cond_init(&conn, NULL);
-
-    return 0;
-}
-
 int
 cli_cmd_lock()
 {
diff --git a/cli/src/cli-cmd.h b/cli/src/cli-cmd.h
index b6bc565993..c1c068c708 100644
--- a/cli/src/cli-cmd.h
+++ b/cli/src/cli-cmd.h
@@ -101,9 +101,6 @@ cli_cmd_await_response(unsigned time);
 int
 cli_cmd_broadcast_response(int32_t status);
 
-int
-cli_cmd_cond_init();
-
 int
 cli_cmd_lock();
 
diff --git a/cli/src/cli.c b/cli/src/cli.c
index fac32d3e9c..cb425c84bd 100644
--- a/cli/src/cli.c
+++ b/cli/src/cli.c
@@ -854,10 +854,6 @@ main(int argc, char *argv[])
     if (ret)
         goto out;
 
-    ret = cli_cmd_cond_init();
-    if (ret)
-        goto out;
-
     ret = cli_input_init(&state);
     if (ret)
         goto out;
-- 
cgit