From 1e472debb3a352e7e204204a66b23e344d2dc11b Mon Sep 17 00:00:00 2001
From: Dustin Sallings <dustin@spy.net>
Date: Sun, 15 Dec 2013 22:09:28 -0800
Subject: minor clang compile fixes

---
 daemon/memcached.c                      | 4 ++--
 daemon/memcached.h                      | 2 ++
 daemon/thread.c                         | 7 +++----
 engines/default_engine/default_engine.c | 4 ++--
 programs/testapp.c                      | 6 ++++--
 testsuite/basic_engine_testsuite.c      | 4 ++--
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/daemon/memcached.c b/daemon/memcached.c
index b6e7287..6517ccf 100644
--- a/daemon/memcached.c
+++ b/daemon/memcached.c
@@ -5583,8 +5583,8 @@ void event_handler(const int fd, const short which, void *arg) {
     LIBEVENT_THREAD *thr = c->thread;
 
     // Do we have pending closes?
-    const size_t max_items = 256;
-    conn *pending_close[max_items];
+    const size_t max_items = MAX_PENDING_CLOSE;
+    conn *pending_close[MAX_PENDING_CLOSE];
     size_t n_pending_close = 0;
     if (thr != NULL) {
         LOCK_THREAD(thr);
diff --git a/daemon/memcached.h b/daemon/memcached.h
index 625b841..572e435 100644
--- a/daemon/memcached.h
+++ b/daemon/memcached.h
@@ -67,6 +67,8 @@
 #define DEFAULT_REQS_PER_EVENT     20
 #define DEFAULT_REQS_PER_TAP_EVENT 50
 
+#define MAX_PENDING_CLOSE 256
+
 /** Append a simple stat with a stat name, value format and value */
 #define APPEND_STAT(name, fmt, val) \
     append_stat(name, add_stats, c, fmt, val);
diff --git a/daemon/thread.c b/daemon/thread.c
index 3c30520..44df3dd 100644
--- a/daemon/thread.c
+++ b/daemon/thread.c
@@ -471,7 +471,6 @@ void finalize_list(conn **list, size_t items) {
     }
 }
 
-
 static void libevent_tap_process(int fd, short which, void *arg) {
     LIBEVENT_THREAD *me = arg;
     assert(me->type == TAP);
@@ -490,9 +489,9 @@ static void libevent_tap_process(int fd, short which, void *arg) {
     }
 
     // Do we have pending closes?
-    const size_t max_items = 256;
+    const size_t max_items = MAX_PENDING_CLOSE;
     LOCK_THREAD(me);
-    conn *pending_close[max_items];
+    conn *pending_close[MAX_PENDING_CLOSE];
     size_t n_pending_close = 0;
 
     if (me->pending_close && me->last_checked != current_time) {
@@ -504,7 +503,7 @@ static void libevent_tap_process(int fd, short which, void *arg) {
     }
 
     // Now copy the pending IO buffer and run them...
-    conn *pending_io[max_items];
+    conn *pending_io[256];
     size_t n_items = list_to_array(pending_io, max_items, &me->pending_io);
 
     UNLOCK_THREAD(me);
diff --git a/engines/default_engine/default_engine.c b/engines/default_engine/default_engine.c
index e877ecc..95bb136 100644
--- a/engines/default_engine/default_engine.c
+++ b/engines/default_engine/default_engine.c
@@ -137,8 +137,8 @@ static bool handled_vbucket(struct default_engine *e, uint16_t vbid) {
 static bool get_item_info(ENGINE_HANDLE *handle, const void *cookie,
                           const item* item, item_info *item_info);
 
-static const char const * vbucket_state_name(vbucket_state_t s) {
-    static const char const * vbucket_states[] = {
+static char const * vbucket_state_name(vbucket_state_t s) {
+    static char const * vbucket_states[] = {
         [vbucket_state_active] = "active",
         [vbucket_state_replica] = "replica",
         [vbucket_state_pending] = "pending",
diff --git a/programs/testapp.c b/programs/testapp.c
index d49c8a7..4705eed 100644
--- a/programs/testapp.c
+++ b/programs/testapp.c
@@ -2234,10 +2234,12 @@ static enum test_return test_binary_bad_tap_ttl(void) {
     return TEST_PASS;
 }
 
+#define max_fds_issue_101 2
+
 static enum test_return test_issue_101(void) {
-    const int max = 2;
+    const int max = max_fds_issue_101;
     enum test_return ret = TEST_PASS;
-    int fds[max];
+    int fds[max_fds_issue_101];
     int ii = 0;
     pid_t child = 0;
 
diff --git a/testsuite/basic_engine_testsuite.c b/testsuite/basic_engine_testsuite.c
index 65541a3..fc9bec7 100644
--- a/testsuite/basic_engine_testsuite.c
+++ b/testsuite/basic_engine_testsuite.c
@@ -321,9 +321,9 @@ static void *incr_test_main(void *arg) {
  */
 static enum test_result mt_incr_test(ENGINE_HANDLE *h, ENGINE_HANDLE_V1 *h1) {
 #ifdef __arm__
-    const int max_threads = 1;
+    #define max_threads 1
 #else
-    const int max_threads = 30;
+    #define max_threads 30
 #endif
     pthread_t tid[max_threads];
 
-- 
cgit v1.2.1