X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fttrss_ws.c;h=98b7f37c5ef7677270a84c3a7e2006ce772d9cd4;hp=92bd60c18d76147fad6d871078a26fc75154931f;hb=c4190d9fdacad96dd8668302871411973339bb77;hpb=5056eed598829edc9b48808bf3ad1da4cfac7051 diff --git a/src/ttrss_ws.c b/src/ttrss_ws.c index 92bd60c..98b7f37 100644 --- a/src/ttrss_ws.c +++ b/src/ttrss_ws.c @@ -30,7 +30,7 @@ #include "ttrss_ws.h" #include "url.h" -static pthread_mutex_t *lock; +static pthread_mutex_t lock; static char *session_id; static char *session_url; @@ -134,7 +134,7 @@ struct json_object *ws_execute(struct json_object *rq) struct json_object *result; log_debug("ws_execute()"); - pthread_mutex_lock(lock); + pthread_mutex_lock(&lock); log_debug("ws_execute() lock"); err = NULL; @@ -152,7 +152,7 @@ struct json_object *ws_execute(struct json_object *rq) } log_debug("ws_execute() unlock"); - pthread_mutex_unlock(lock); + pthread_mutex_unlock(&lock); log_debug("ws_execute()"); @@ -208,7 +208,7 @@ char *ws_login() int ws_open_session() { - int /*version, */result; + int version, result; log_debug("ws_open_session()"); @@ -219,16 +219,16 @@ int ws_open_session() session_id = ws_login(); if (session_id) { - /*version = ws_get_api_version(); + version = ws_get_api_version(); log_debug("API version= %d", version); - + if (version > 0) { result = 1; } else { free(session_id); session_id = NULL; result = 0; - }*/ + } result = 1; } else { result = 0; @@ -404,8 +404,6 @@ void ws_set_article_unread(int id, int unread) void ws_init() { pthread_mutexattr_t attr; - pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); - lock = malloc(sizeof(pthread_mutex_t)); - pthread_mutex_init(lock, &attr); + pthread_mutex_init(&lock, &attr); }