From: Art Cancro <ajc@citadel.org>
Date: Fri, 11 Aug 2023 12:42:46 +0000 (-0900)
Subject: Revert "Prepared for upcoming change to cdb_next_item() API."
X-Git-Tag: v989~81
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=dc57426c159cffd0de9ef550655c356bbb2aa44f;p=citadel.git

Revert "Prepared for upcoming change to cdb_next_item() API."

This reverts commit d805c8202867ff3cc4049e5df6a3e871c4fdc5be.
---

diff --git a/citadel/server/room_ops.c b/citadel/server/room_ops.c
index 7fefdbbf3..1566e74b0 100644
--- a/citadel/server/room_ops.c
+++ b/citadel/server/room_ops.c
@@ -528,6 +528,7 @@ void CtdlForEachRoom(ForEachRoomCallBack callback_func, void *in_data) {
 	struct cdbdata *cdbqr;
 
 	cdb_rewind(CDB_ROOMS);
+
 	while (cdbqr = cdb_next_item(CDB_ROOMS), cdbqr != NULL) {
  		memset(&qrbuf, 0, sizeof(struct ctdlroom));
  		memcpy(&qrbuf, cdbqr->ptr, ((cdbqr->len > sizeof(struct ctdlroom)) ?  sizeof(struct ctdlroom) : cdbqr->len) );
diff --git a/citadel/server/user_ops.c b/citadel/server/user_ops.c
index 76897347c..31bd579d3 100644
--- a/citadel/server/user_ops.c
+++ b/citadel/server/user_ops.c
@@ -1043,8 +1043,10 @@ void ForEachUser(void (*CallBack) (char *, void *out_data), void *in_data) {
 		return;
 	}
 
-	// Phase 1 : build an array of all our user account names
+
 	cdb_rewind(CDB_USERS);
+
+	// Phase 1 : build an array of all our user account names
 	while (cdbus = cdb_next_item(CDB_USERS), cdbus != NULL) {
 		usptr = (struct ctdluser *) cdbus->ptr;
 		if (strlen(usptr->fullname) > 0) {