* Initialize more variables during declaration,

[citadel.git] / citadel / serv_vcard.c

diff --git a/citadel/serv_vcard.c b/citadel/serv_vcard.c
index ffa723f3f651d86a43559fc68385a32e1a498a92..9f67eea336af7a1cdcd9cc7501699640d49d12c0 100644 (file)
--- a/citadel/serv_vcard.c
+++ b/citadel/serv_vcard.c
@@ -507,7 +507,7 @@ void vcard_gu_backend(long supplied_msgnum, void *userdata) {
 struct vCard *vcard_get_user(struct ctdluser *u) {
        char hold_rm[ROOMNAMELEN];
        char config_rm[ROOMNAMELEN];
-       struct CtdlMessage *msg;
+       struct CtdlMessage *msg = NULL;
        struct vCard *v;
        long VCmsgnum;
 
@@ -961,7 +961,7 @@ void vcard_create_room(void)
  * When a user logs in...
  */
 void vcard_session_login_hook(void) {
-       struct vCard *v;
+       struct vCard *v = NULL;
 
        v = vcard_get_user(&CC->user);
        extract_primary_inet_email(CC->cs_inet_email,
@@ -1011,7 +1011,7 @@ struct vCard *vcard_new_from_rfc822_addr(char *addr) {
  */
 void strip_addresses_already_have(long msgnum, void *userdata) {
        char *collected_addresses;
-       struct CtdlMessage *msg;
+       struct CtdlMessage *msg = NULL;
        struct vCard *v;
        char *value = NULL;
        int i, j;