* Killed off CtdlGetDynamicSymbol() and just put all the symbols in server.h

[citadel.git] / citadel / serv_vcard.c

diff --git a/citadel/serv_vcard.c b/citadel/serv_vcard.c
index beed02f7f1663461506bdd9dd2420aab4d11e4fc..08d1280168a008585afa39217245e8dc2d66e685 100644 (file)
--- a/citadel/serv_vcard.c
+++ b/citadel/serv_vcard.c
@@ -69,7 +69,6 @@ struct vcard_internal_info {
 };
 
 /* Message number symbol used internally by these functions */
-unsigned long SYM_VCARD;
 #define VC ((struct vcard_internal_info *)CtdlGetUserData(SYM_VCARD))
 
 
@@ -255,7 +254,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
        char *ptr;
        int linelen;
        char buf[SIZ];
-       struct user usbuf;
+       struct ctdluser usbuf;
        long what_user;
 
        if (!CC->logged_in) return(0);  /* Only do this if logged in. */
@@ -291,7 +290,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
                        if (what_user == CC->user.usernum) {
                                /* It's the logged in user.  That was easy. */
                                memcpy(&usbuf, &CC->user,
-                                       sizeof(struct user) );
+                                       sizeof(struct ctdluser) );
                        }
                        
                        else if (getuserbynumber(&usbuf, what_user) == 0) {
@@ -421,7 +420,7 @@ void vcard_gu_backend(long msgnum, void *userdata) {
  * If this user has a vcard on disk, read it into memory, otherwise allocate
  * and return an empty vCard.
  */
-struct vCard *vcard_get_user(struct user *u) {
+struct vCard *vcard_get_user(struct ctdluser *u) {
         char hold_rm[ROOMNAMELEN];
         char config_rm[ROOMNAMELEN];
        struct CtdlMessage *msg;
@@ -458,7 +457,7 @@ struct vCard *vcard_get_user(struct user *u) {
 /*
  * Write our config to disk
  */
-void vcard_write_user(struct user *u, struct vCard *v) {
+void vcard_write_user(struct ctdluser *u, struct vCard *v) {
         char temp[PATH_MAX];
         FILE *fp;
        char *ser;
@@ -559,7 +558,7 @@ void cmd_regi(char *argbuf) {
  */
 void cmd_greg(char *argbuf)
 {
-       struct user usbuf;
+       struct ctdluser usbuf;
        struct vCard *v;
        char *s;
        char who[SIZ];
@@ -784,7 +783,6 @@ void vcard_session_login_hook(void) {
 
 char *serv_vcard_init(void)
 {
-       SYM_VCARD = CtdlGetDynamicSymbol();
        CtdlRegisterSessionHook(vcard_session_startup_hook, EVT_START);
        CtdlRegisterSessionHook(vcard_session_login_hook, EVT_LOGIN);
        CtdlRegisterMessageHook(vcard_upload_beforesave, EVT_BEFORESAVE);