Exposed logout() from user_ops.c, deprecated it in accordance with

the published coding style.

diff --git a/citadel/include/ctdl_module.h b/citadel/include/ctdl_module.h
index 616b68edbd96ab3e1f7e7fc010c1d13c3a756885..4547c9743365bfddf8b6d5a4dc1619860ee85924 100644 (file)
--- a/citadel/include/ctdl_module.h
+++ b/citadel/include/ctdl_module.h
@@ -321,6 +321,8 @@ enum {
        login_not_found
 };
 
+void CtdlUserLogout(void);
+
 
 
 

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 6cbef4ff0bf3d7cb5306dc6ea01ff38b23ba6b2b..172a4ad0921c00da53e5e49bf86911a7880712bb 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -781,6 +781,12 @@ void logged_in_response(void)
  * misc things to be taken care of when a user is logged out
  */
 void logout(void)
+{
+       CtdlUserLogout();
+}
+
+
+void CtdlUserLogout(void)
 {
        CitContext *CCC = CC;   /* CachedCitContext - performance boost */
        /*

diff --git a/citadel/user_ops.h b/citadel/user_ops.h
index c0cf9f9ebd31cd4425c2281922ee41194d8a6e77..5ae367c8653b33547517d70ecdc41582552b90bb 100644 (file)
--- a/citadel/user_ops.h
+++ b/citadel/user_ops.h
@@ -16,7 +16,8 @@ void rebuild_usersbynumber(void);
 void cmd_user (char *cmdbuf);
 void session_startup (void);
 void logged_in_response(void);
-void logout (void);
+/* logout() is deprecated use CtdlUserLogout() instead */
+void logout (void) __attribute__ ((deprecated));
 int purge_user (char *pname);
 int create_user (char *newusername, int become_user);
 void do_login(void);