* Replaced all "Citadel/UX" references with "Citadel"

[citadel.git] / citadel / vcard.c

diff --git a/citadel/vcard.c b/citadel/vcard.c
index 3906c4c22daf58490937c1ed6094f5163eb08f21..d0c51e177476f61a355724f8c7e24935e360873e 100644 (file)
--- a/citadel/vcard.c
+++ b/citadel/vcard.c
@@ -1,7 +1,7 @@
 /*
  * $Id$
  *
- * vCard implementation for Citadel/UX
+ * vCard implementation for Citadel
  *
  * Copyright (C) 1999 by Art Cancro
  * This code is freely redistributable under the terms of the GNU General
@@ -30,7 +30,6 @@
 #include <string.h>
 #include <errno.h>
 #include <limits.h>
-#include <syslog.h>
 
 #include "citadel.h"
 #include "server.h"
@@ -43,7 +42,7 @@
 struct vCard *vcard_new() {
        struct vCard *v;
 
-       v = (struct vCard *) mallok(sizeof(struct vCard));
+       v = (struct vCard *) malloc(sizeof(struct vCard));
        if (v == NULL) return v;
 
        v->magic = CTDL_VCARD_MAGIC;
@@ -54,6 +53,19 @@ struct vCard *vcard_new() {
 }
 
 
+/*
+ * Add a property to a vCard
+ */
+void vcard_add_prop(struct vCard *v, char *propname, char *propvalue) {
+       ++v->numprops;
+       v->prop = realloc(v->prop,
+               (v->numprops * sizeof(char *) * 2) );
+       v->prop[v->numprops-1].name = strdup(propname);
+       v->prop[v->numprops-1].value = strdup(propvalue);
+}
+
+
+
 /*
  * Constructor (supply serialized vCard)
  */
@@ -65,7 +77,7 @@ struct vCard *vcard_load(char *vtext) {
        int i;
        int colonpos, nlpos;
 
-       mycopy = strdoop(vtext);
+       mycopy = strdup(vtext);
        if (mycopy == NULL) return NULL;
 
        /* First, fix this big pile o' vCard to make it more parseable.
@@ -92,8 +104,8 @@ struct vCard *vcard_load(char *vtext) {
                nlpos = pattern2(ptr, "\n");
 
                if ((nlpos > colonpos) && (colonpos > 0)) {
-                       namebuf = mallok(colonpos + 1);
-                       valuebuf = mallok(nlpos - colonpos + 1);
+                       namebuf = malloc(colonpos + 1);
+                       valuebuf = malloc(nlpos - colonpos + 1);
                        strncpy(namebuf, ptr, colonpos);
                        namebuf[colonpos] = 0;
                        strncpy(valuebuf, &ptr[colonpos+1], nlpos-colonpos-1);
@@ -106,14 +118,14 @@ struct vCard *vcard_load(char *vtext) {
 
                        if ( (valid) && (strcasecmp(namebuf, "begin")) ) {
                                ++v->numprops;
-                               v->prop = reallok(v->prop,
+                               v->prop = realloc(v->prop,
                                        (v->numprops * sizeof(char *) * 2) );
                                v->prop[v->numprops-1].name = namebuf;
                                v->prop[v->numprops-1].value = valuebuf;
                        } 
                        else {
-                               phree(namebuf);
-                               phree(valuebuf);
+                               free(namebuf);
+                               free(valuebuf);
                        }
 
                }
@@ -124,7 +136,7 @@ struct vCard *vcard_load(char *vtext) {
                if (*ptr == '\n') ++ptr;
        }
 
-       phree(mycopy);
+       free(mycopy);
        return v;
 }
 
@@ -164,8 +176,6 @@ char *vcard_get_prop(struct vCard *v, char *propname,
 }
 
 
-
-
 /*
  * Destructor
  */
@@ -175,14 +185,14 @@ void vcard_free(struct vCard *v) {
        if (v->magic != CTDL_VCARD_MAGIC) return;       /* Self-check */
        
        if (v->numprops) for (i=0; i<(v->numprops); ++i) {
-               phree(v->prop[i].name);
-               phree(v->prop[i].value);
+               free(v->prop[i].name);
+               free(v->prop[i].value);
        }
 
-       if (v->prop != NULL) phree(v->prop);
+       if (v->prop != NULL) free(v->prop);
        
        memset(v, 0, sizeof(struct vCard));
-       phree(v);
+       free(v);
 }
 
 
@@ -199,20 +209,20 @@ void vcard_set_prop(struct vCard *v, char *name, char *value, int append) {
        /* If this key is already present, replace it */
        if (!append) if (v->numprops) for (i=0; i<(v->numprops); ++i) {
                if (!strcasecmp(v->prop[i].name, name)) {
-                       phree(v->prop[i].name);
-                       phree(v->prop[i].value);
-                       v->prop[i].name = strdoop(name);
-                       v->prop[i].value = strdoop(value);
+                       free(v->prop[i].name);
+                       free(v->prop[i].value);
+                       v->prop[i].name = strdup(name);
+                       v->prop[i].value = strdup(value);
                        return;
                }
        }
 
        /* Otherwise, append it */
        ++v->numprops;
-       v->prop = reallok(v->prop,
+       v->prop = realloc(v->prop,
                (v->numprops * sizeof(char *) * 2) );
-       v->prop[v->numprops-1].name = strdoop(name);
-       v->prop[v->numprops-1].value = strdoop(value);
+       v->prop[v->numprops-1].name = strdup(name);
+       v->prop[v->numprops-1].value = strdup(value);
 }
 
 
@@ -238,7 +248,7 @@ char *vcard_serialize(struct vCard *v)
                        strlen(v->prop[i].value) + 4;
        }
 
-       ser = mallok(len);
+       ser = malloc(len);
        if (ser == NULL) return NULL;
 
        strcpy(ser, "begin:vcard\r\n");