projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify http_server_destroy
[pazpar2-moved-to-github.git]
/
src
/
http.c
diff --git
a/src/http.c
b/src/http.c
index
59d0050
..
8321bb3
100644
(file)
--- a/
src/http.c
+++ b/
src/http.c
@@
-63,6
+63,7
@@
typedef int socklen_t;
#include <yaz/nmem.h>
#include <yaz/mutex.h>
#include <yaz/nmem.h>
#include <yaz/mutex.h>
+#include "ppmutex.h"
#include "session.h"
#include "http.h"
#include "session.h"
#include "http.h"
@@
-1373,14
+1374,9
@@
void http_server_destroy(http_server_t hs)
{
int r;
{
int r;
- if (hs->mutex)
- {
- yaz_mutex_enter(hs->mutex);
- r = --(hs->ref_count);
- yaz_mutex_leave(hs->mutex);
- }
- else
- r = --(hs->ref_count);
+ yaz_mutex_enter(hs->mutex); /* OK: hs->mutex may be NULL */
+ r = --(hs->ref_count);
+ yaz_mutex_leave(hs->mutex);
if (r == 0)
{
if (r == 0)
{
@@
-1421,7
+1417,7
@@
void http_mutex_init(struct conf_server *server)
assert(server);
assert(server->http_server->mutex == 0);
assert(server);
assert(server->http_server->mutex == 0);
- yaz_mutex_create(&server->http_server->mutex);
+ pazpar2_mutex_create(&server->http_server->mutex, "http_server");
server->http_server->http_sessions = http_sessions_create();
}
server->http_server->http_sessions = http_sessions_create();
}