summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Bohman <debohman@gmail.com>2022-10-13 17:08:25 -0700
committerdormando <dormando@rydia.net>2022-10-20 14:46:00 -0700
commitf34a2b68cdec7fc638b125757d8ff7dd8f150c34 (patch)
treee09dd099aae3b336502b1380188c8d56e134af88
parente2d62c6589ea9b94cb66df57c6d08eb346c4b8c4 (diff)
downloadmemcached-f34a2b68cdec7fc638b125757d8ff7dd8f150c34.tar.gz
Fixes to build with clang-15:
Fix unused variable error when dtrace is not enabled. Add void parameter declaration for drop_privileges() in darwin_priv.c.
-rw-r--r--assoc.c4
-rw-r--r--darwin_priv.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/assoc.c b/assoc.c
index 01063a9..335bec1 100644
--- a/assoc.c
+++ b/assoc.c
@@ -80,14 +80,18 @@ item *assoc_find(const char *key, const size_t nkey, const uint32_t hv) {
}
item *ret = NULL;
+#ifdef ENABLE_DTRACE
int depth = 0;
+#endif
while (it) {
if ((nkey == it->nkey) && (memcmp(key, ITEM_key(it), nkey) == 0)) {
ret = it;
break;
}
it = it->h_next;
+#ifdef ENABLE_DTRACE
++depth;
+#endif
}
MEMCACHED_ASSOC_FIND(key, nkey, depth);
return ret;
diff --git a/darwin_priv.c b/darwin_priv.c
index 411b5fa..b7b18da 100644
--- a/darwin_priv.c
+++ b/darwin_priv.c
@@ -10,7 +10,7 @@
* the sandbox api is marked deprecated, however still used
* by couple of major softwares/libraries like openssh
*/
-void drop_privileges() {
+void drop_privileges(void) {
extern char *__progname;
char *error = NULL;