projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update hardening rules.
[awesomized/libmemcached]
/
memcached
/
assoc.c
diff --git
a/memcached/assoc.c
b/memcached/assoc.c
index f14d85d80a20168420f907924c5a505cd49f420f..bcaf6f2692e4b4785b4580b07ba034a2f31c089f 100644
(file)
--- a/
memcached/assoc.c
+++ b/
memcached/assoc.c
@@
-12,7
+12,6
@@
*/
#include "memcached.h"
*/
#include "memcached.h"
-
#include <sys/stat.h>
#include <sys/socket.h>
#include <sys/signal.h>
#include <sys/stat.h>
#include <sys/socket.h>
#include <sys/signal.h>
@@
-28,13
+27,6
@@
static pthread_cond_t maintenance_cond = PTHREAD_COND_INITIALIZER;
static pthread_cond_t maintenance_cond = PTHREAD_COND_INITIALIZER;
-#ifndef __INTEL_COMPILER
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif
-
-#ifndef __INTEL_COMPILER
-#pragma GCC diagnostic ignored "-Wunused-parameter"
-#endif
typedef unsigned long int ub4; /* unsigned 4-byte quantities */
typedef unsigned char ub1; /* unsigned 1-byte quantities */
typedef unsigned long int ub4; /* unsigned 4-byte quantities */
typedef unsigned char ub1; /* unsigned 1-byte quantities */
@@
-243,7
+235,7
@@
static void *assoc_maintenance_thread(void *arg) {
pthread_cond_wait(&maintenance_cond, &cache_lock);
}
pthread_cond_wait(&maintenance_cond, &cache_lock);
}
-
pthread_
mutex_unlock(&cache_lock);
+ mutex_unlock(&cache_lock);
}
return NULL;
}
}
return NULL;
}
@@
-271,7
+263,7
@@
void stop_assoc_maintenance_thread() {
mutex_lock(&cache_lock);
do_run_maintenance_thread = 0;
pthread_cond_signal(&maintenance_cond);
mutex_lock(&cache_lock);
do_run_maintenance_thread = 0;
pthread_cond_signal(&maintenance_cond);
-
pthread_
mutex_unlock(&cache_lock);
+ mutex_unlock(&cache_lock);
/* Wait for the maintenance thread to stop */
pthread_join(maintenance_tid, NULL);
/* Wait for the maintenance thread to stop */
pthread_join(maintenance_tid, NULL);