[Pkg-voip-commits] [janus] 87/163: Fixed static mutex initialization in HTTP transport, as per recent changes

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag debian/0.2.5-1
in repository janus.

commit 6b634c29fdb302b14e68fa5defaa33cb61247248
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Mon Sep 4 18:02:59 2017 +0200

    Fixed static mutex initialization in HTTP transport, as per recent changes
---
 transports/janus_http.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/transports/janus_http.c b/transports/janus_http.c
index 00407e7..8a40163 100644
--- a/transports/janus_http.c
+++ b/transports/janus_http.c
@@ -125,7 +125,7 @@ typedef struct janus_http_msg {
 	json_t *response;					/* The response from the core */
 } janus_http_msg;
 static GHashTable *messages = NULL;
-static janus_mutex messages_mutex = PTHREAD_MUTEX_INITIALIZER;
+static janus_mutex messages_mutex = JANUS_MUTEX_INITIALIZER;
 
 
 /* Helper for long poll: HTTP events to push per session */
@@ -138,7 +138,7 @@ const char *keepalive_id = "keepalive";
 GHashTable *sessions = NULL;
 GList *old_sessions = NULL;
 GThread *sessions_watchdog = NULL;
-janus_mutex sessions_mutex;
+janus_mutex sessions_mutex = JANUS_MUTEX_INITIALIZER;
 
 
 /* Callback (libmicrohttpd) invoked when a new connection is attempted on the REST API */
@@ -874,7 +874,6 @@ int janus_http_init(janus_transport_callbacks *callback, const char *config_path
 	messages = g_hash_table_new(NULL, NULL);
 	sessions = g_hash_table_new_full(g_int64_hash, g_int64_equal, (GDestroyNotify)g_free, NULL);
 	old_sessions = NULL;
-	janus_mutex_init(&sessions_mutex);
 	GError *error = NULL;
 	/* Start the HTTP/Janus sessions watchdog */
 	sessions_watchdog = g_thread_try_new("http watchdog", &janus_http_sessions_watchdog, NULL, &error);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/janus.git