summaryrefslogtreecommitdiffstats
path: root/ctdb/server/ctdb_serverids.c
diff options
context:
space:
mode:
Diffstat (limited to 'ctdb/server/ctdb_serverids.c')
-rw-r--r--ctdb/server/ctdb_serverids.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/ctdb/server/ctdb_serverids.c b/ctdb/server/ctdb_serverids.c
index 4ed3012a30..dba25edced 100644
--- a/ctdb/server/ctdb_serverids.c
+++ b/ctdb/server/ctdb_serverids.c
@@ -119,20 +119,21 @@ struct count_server_ids {
struct ctdb_server_id_list *list;
};
-static void server_id_count(void *param, void *data)
+static int server_id_count(void *param, void *data)
{
struct count_server_ids *svid = talloc_get_type(param,
struct count_server_ids);
if (svid == NULL) {
DEBUG(DEBUG_ERR, (__location__ " Got null pointer for svid\n"));
- return;
+ return -1;
}
svid->count++;
+ return 0;
}
-static void server_id_store(void *param, void *data)
+static int server_id_store(void *param, void *data)
{
struct count_server_ids *svid = talloc_get_type(param,
struct count_server_ids);
@@ -141,16 +142,17 @@ static void server_id_store(void *param, void *data)
if (svid == NULL) {
DEBUG(DEBUG_ERR, (__location__ " Got null pointer for svid\n"));
- return;
+ return -1;
}
if (svid->count >= svid->list->num) {
DEBUG(DEBUG_ERR, (__location__ " size of server id tree changed during traverse\n"));
- return;
+ return -1;
}
memcpy(&svid->list->server_ids[svid->count], server_id, sizeof(struct ctdb_server_id));
svid->count++;
+ return 0;
}
/*