From ece8da4e0b7e2b371494b7c58a53041da6773d6b Mon Sep 17 00:00:00 2001 From: Dave West Date: Tue, 10 Nov 2009 20:00:25 +0000 Subject: [PATCH] Cleaned a few warnings about deprecated functions. --- citadel/citserver.c | 2 +- citadel/context.c | 2 +- citadel/euidindex.c | 2 +- citadel/modules/calendar/serv_calendar.c | 2 +- citadel/modules/jabber/xmpp_sasl_service.c | 4 ++-- citadel/msgbase.c | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/citadel/citserver.c b/citadel/citserver.c index a0ef13419..d0c7007ff 100644 --- a/citadel/citserver.c +++ b/citadel/citserver.c @@ -1040,7 +1040,7 @@ void cmd_quit(char *argbuf) void cmd_lout(char *argbuf) { if (CC->logged_in) - logout(); + CtdlUserLogout(); cprintf("%d logged out.\n", CIT_OK); } diff --git a/citadel/context.c b/citadel/context.c index c7902af98..bb16d0476 100644 --- a/citadel/context.c +++ b/citadel/context.c @@ -239,7 +239,7 @@ void RemoveContext (CitContext *con) * might make references to "CC" assuming it's the right one. */ become_session(con); - logout(); + CtdlUserLogout(); PerformSessionHooks(EVT_STOP); become_session(NULL); diff --git a/citadel/euidindex.c b/citadel/euidindex.c index c7499d832..d45689ff7 100644 --- a/citadel/euidindex.c +++ b/citadel/euidindex.c @@ -233,7 +233,7 @@ void cmd_euid(char *cmdbuf) { if (CtdlAccessCheck(ac_logged_in)) return; extract_token(euid, cmdbuf, 0, '|', sizeof euid); - msgnum = locate_message_by_euid(euid, &CC->room); + msgnum = CtdlLocateMessageByEuid(euid, &CC->room); if (msgnum <= 0L) { cprintf("%d not found\n", ERROR + MESSAGE_NOT_FOUND); return; diff --git a/citadel/modules/calendar/serv_calendar.c b/citadel/modules/calendar/serv_calendar.c index 0426814af..bf9f2e9af 100644 --- a/citadel/modules/calendar/serv_calendar.c +++ b/citadel/modules/calendar/serv_calendar.c @@ -612,7 +612,7 @@ int ical_update_my_calendar_with_reply(icalcomponent *cal) { * Citadel always sets the message EUID to the iCalendar UID of * the event, this will work. */ - msgnum_being_replaced = locate_message_by_euid(uid, &CC->room); + msgnum_being_replaced = CtdlLocateMessageByEuid(uid, &CC->room); CtdlGetRoom(&CC->room, hold_rm); /* return to saved room */ diff --git a/citadel/modules/jabber/xmpp_sasl_service.c b/citadel/modules/jabber/xmpp_sasl_service.c index f015236e0..1391512c4 100644 --- a/citadel/modules/jabber/xmpp_sasl_service.c +++ b/citadel/modules/jabber/xmpp_sasl_service.c @@ -130,7 +130,7 @@ void xmpp_sasl_auth(char *sasl_auth_mech, char *authstring) { return; } - if (CC->logged_in) logout(); /* Client may try to log in twice. Handle this. */ + if (CC->logged_in) CtdlUserLogout(); /* Client may try to log in twice. Handle this. */ if (CC->nologin) { cprintf(""); @@ -157,7 +157,7 @@ void xmpp_sasl_auth(char *sasl_auth_mech, char *authstring) { void jabber_non_sasl_authenticate(char *iq_id, char *username, char *password, char *resource) { int result; - if (CC->logged_in) logout(); /* Client may try to log in twice. Handle this. */ + if (CC->logged_in) CtdlUserLogout(); /* Client may try to log in twice. Handle this. */ result = CtdlLoginExistingUser(NULL, username); if (result == login_ok) { diff --git a/citadel/msgbase.c b/citadel/msgbase.c index 779d39506..4f5c4046f 100644 --- a/citadel/msgbase.c +++ b/citadel/msgbase.c @@ -2699,7 +2699,7 @@ void ReplicationChecks(struct CtdlMessage *msg) { /*CtdlLogPrintf(CTDL_DEBUG, "Exclusive ID: <%s> for room <%s>\n", msg->cm_fields['E'], CC->room.QRname);*/ - old_msgnum = locate_message_by_euid(msg->cm_fields['E'], &CC->room); + old_msgnum = CtdlLocateMessageByEuid(msg->cm_fields['E'], &CC->room); if (old_msgnum > 0L) { CtdlLogPrintf(CTDL_DEBUG, "ReplicationChecks() replacing message %ld\n", old_msgnum); CtdlDeleteMessages(CC->room.QRname, &old_msgnum, 1, ""); @@ -2959,7 +2959,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ msg->cm_fields['W'] = strdup(recipient); CtdlMailboxName(actual_rm, sizeof actual_rm, &userbuf, MAILROOM); CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0, msg); - BumpNewMailCounter(userbuf.usernum); + CtdlBumpNewMailCounter(userbuf.usernum); if (!IsEmptyStr(config.c_funambol_host) || !IsEmptyStr(config.c_pager_program)) { /* Generate a instruction message for the Funambol notification * server, in the same style as the SMTP queue -- 2.30.2