From b2d98b7727e77e91aa8468bcccbecf7e0d492602 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Thu, 17 Aug 2023 13:13:33 -0900 Subject: [PATCH] serv_nntp.c: move to new API --- citadel/server/modules/nntp/serv_nntp.c | 11 ++--------- citadel/server/room_ops.c | 11 +++++++++++ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/citadel/server/modules/nntp/serv_nntp.c b/citadel/server/modules/nntp/serv_nntp.c index 9ea78f11a..30be5027b 100644 --- a/citadel/server/modules/nntp/serv_nntp.c +++ b/citadel/server/modules/nntp/serv_nntp.c @@ -288,15 +288,8 @@ struct nntp_msglist nntp_fetch_msglist(struct ctdlroom *qrbuf) { struct nntp_msglist nm; struct cdbdata *cdbfr; - cdbfr = cdb_fetch(CDB_MSGLISTS, &qrbuf->QRnumber, sizeof(long)); - if (cdbfr != NULL) { - nm.msgnums = (long*)cdbfr->ptr; - cdbfr->ptr = NULL; // (this needs attention if we move to LMDB) - nm.num_msgs = cdbfr->len / sizeof(long); - cdbfr->len = 0; - cdb_free(cdbfr); - } - else { + nm.num_msgs = CtdlFetchMsgList(qrbuf->QRnumber, &nm.msgnums); + if (nm.msgnums < 0) { nm.num_msgs = 0; nm.msgnums = NULL; } diff --git a/citadel/server/room_ops.c b/citadel/server/room_ops.c index 344c6b97d..5eb5e69fa 100644 --- a/citadel/server/room_ops.c +++ b/citadel/server/room_ops.c @@ -620,6 +620,17 @@ int CtdlFetchMsgList(long roomnum, long **msgs) { memcpy(*msgs, cdbfr->ptr, cdbfr->len); num_msgs = cdbfr->len / sizeof(long); cdb_free(cdbfr); + // BEGIN diagnostic section remove this + syslog(LOG_DEBUG, "\033[7mCtdlFetchMsgList(%ld) %d messages\033[0m", roomnum, num_msgs); + int i; + long *p = *msgs; + long msgnum; + if (num_msgs>0) for (i=0; i