Calls to cdb_fetch()/cdb_next_item() now check ptr for NULL or non-NULL

[citadel.git] / citadel / server / modules / expire / serv_expire.c

diff --git a/citadel/server/modules/expire/serv_expire.c b/citadel/server/modules/expire/serv_expire.c
index bda629bf35887a6db7bd460017d2001303bceb03..20ac197ddd9c4a33fc712256eab4235d0a694c85 100644 (file)
--- a/citadel/server/modules/expire/serv_expire.c
+++ b/citadel/server/modules/expire/serv_expire.c
@@ -505,7 +505,7 @@ int PurgeVisits(void) {
 
        // Now traverse through the visits, purging irrelevant records...
        cdb_rewind(CDB_VISIT);
-       while(cdbvisit = cdb_next_item(CDB_VISIT), cdbvisit.len>0) {
+       while(cdbvisit = cdb_next_item(CDB_VISIT), cdbvisit.ptr!=NULL) {
                memset(&vbuf, 0, sizeof(struct visit));
                memcpy(&vbuf, cdbvisit.ptr,
                        ( (cdbvisit.len > sizeof(struct visit)) ?
@@ -584,7 +584,7 @@ int PurgeUseTable(StrBuf *ErrMsg) {
 
        syslog(LOG_DEBUG, "Purge use table: phase 1");
        cdb_rewind(CDB_USETABLE);
-       while(cdbut = cdb_next_item(CDB_USETABLE), cdbut.len>0) {
+       while(cdbut = cdb_next_item(CDB_USETABLE), cdbut.ptr!=NULL) {
                ++total;
                if (cdbut.len > sizeof(struct UseTable))
                        memcpy(&ut, cdbut.ptr, sizeof(struct UseTable));
@@ -625,7 +625,7 @@ int PurgeEuidIndexTable(void) {
        // Phase 1: traverse through the table, discovering old records...
        syslog(LOG_DEBUG, "Purge EUID index: phase 1");
        cdb_rewind(CDB_EUIDINDEX);
-       while(cdbei = cdb_next_item(CDB_EUIDINDEX), cdbei.len>0) {
+       while(cdbei = cdb_next_item(CDB_EUIDINDEX), cdbei.ptr!=NULL) {
 
                memcpy(&msgnum, cdbei.ptr, sizeof(long));