/*
- silcvcard.c
+ silcvcard.c
Author: Pekka Riikonen <priikone@silcnet.org>
"FN:", vcard->full_name, "\n",
"N:", vcard->family_name, ";", vcard->first_name, ";",
vcard->middle_names, ";", vcard->prefix, ";", vcard->suffix, "\n",
- SILC_STR_END);
+ SILC_STRFMT_END);
if (vcard->nickname)
silc_buffer_strformat(&buffer,
"NICKNAME:", vcard->nickname, "\n",
- SILC_STR_END);
+ SILC_STRFMT_END);
if (vcard->bday)
silc_buffer_strformat(&buffer,
"BDAY:", vcard->bday, "\n",
- SILC_STR_END);
+ SILC_STRFMT_END);
if (vcard->title)
silc_buffer_strformat(&buffer,
"TITLE:", vcard->title, "\n",
- SILC_STR_END);
+ SILC_STRFMT_END);
if (vcard->role)
silc_buffer_strformat(&buffer,
"ROLE:", vcard->role, "\n",
- SILC_STR_END);
+ SILC_STRFMT_END);
if (vcard->org_name)
silc_buffer_strformat(&buffer,
"ORG:", vcard->org_name, ";", vcard->org_unit, "\n",
- SILC_STR_END);
+ SILC_STRFMT_END);
if (vcard->categories)
silc_buffer_strformat(&buffer,
"CATEGORIES:", vcard->categories, "\n",
- SILC_STR_END);
- if (vcard->class)
+ SILC_STRFMT_END);
+ if (vcard->catclass)
silc_buffer_strformat(&buffer,
- "CLASS:", vcard->class, "\n",
- SILC_STR_END);
+ "CLASS:", vcard->catclass, "\n",
+ SILC_STRFMT_END);
if (vcard->url)
silc_buffer_strformat(&buffer,
"URL:", vcard->url, "\n",
- SILC_STR_END);
+ SILC_STRFMT_END);
if (vcard->label)
silc_buffer_strformat(&buffer,
"LABEL;", vcard->url, "\n",
- SILC_STR_END);
+ SILC_STRFMT_END);
for (i = 0; i < vcard->num_addrs; i++) {
silc_buffer_strformat(&buffer,
"ADR;TYPE=",
vcard->addrs[i].state, ";",
vcard->addrs[i].code, ";",
vcard->addrs[i].country, "\n",
- SILC_STR_END);
+ SILC_STRFMT_END);
}
for (i = 0; i < vcard->num_tels; i++) {
silc_buffer_strformat(&buffer,
"TEL;TYPE=",
vcard->tels[i].type, ":",
- vcard->tels[i].tel, "\n",
- SILC_STR_END);
+ vcard->tels[i].telnum, "\n",
+ SILC_STRFMT_END);
}
for (i = 0; i < vcard->num_emails; i++) {
silc_buffer_strformat(&buffer,
"EMAIL;TYPE=",
vcard->emails[i].type, ":",
vcard->emails[i].address, "\n",
- SILC_STR_END);
+ SILC_STRFMT_END);
}
if (vcard->note)
silc_buffer_strformat(&buffer,
"NOTE:", vcard->note, "\n",
- SILC_STR_END);
+ SILC_STRFMT_END);
if (vcard->rev)
silc_buffer_strformat(&buffer,
"REV:", vcard->rev, "\n",
- SILC_STR_END);
+ SILC_STRFMT_END);
- silc_buffer_strformat(&buffer, VCARD_FOOTER, SILC_STR_END);
+ silc_buffer_strformat(&buffer, VCARD_FOOTER, SILC_STRFMT_END);
if (vcard_len)
*vcard_len = buffer.truelen;
unsigned char *val;
bool has_begin = FALSE, has_end = FALSE;
int len, i, off = 0;
-
+
val = (unsigned char *)data;
while (val) {
len = 0;
VCARD_FIELD(val, "TITLE:", vcard->title);
VCARD_FIELD(val, "ROLE:", vcard->role);
VCARD_FIELD(val, "CATEGORIES:", vcard->categories);
- VCARD_FIELD(val, "CLASS:", vcard->class);
+ VCARD_FIELD(val, "CLASS:", vcard->catclass);
VCARD_FIELD(val, "URL:", vcard->url);
VCARD_FIELD(val, "LABEL;", vcard->label);
VCARD_FIELD(val, "NOTE:", vcard->note);
VCARD_TYPETOKEN(vcard->tels[vcard->num_tels].type);
break;
}
- VCARD_LASTTOKEN(vcard->tels[vcard->num_tels].tel);
+ VCARD_LASTTOKEN(vcard->tels[vcard->num_tels].telnum);
}
vcard->num_tels++;
goto next;
silc_free(vcard->org_name);
silc_free(vcard->org_unit);
silc_free(vcard->categories);
- silc_free(vcard->class);
+ silc_free(vcard->catclass);
silc_free(vcard->url);
silc_free(vcard->label);
for (i = 0; i < vcard->num_addrs; i++) {
silc_free(vcard->addrs);
for (i = 0; i < vcard->num_tels; i++) {
silc_free(vcard->tels[i].type);
- silc_free(vcard->tels[i].tel);
+ silc_free(vcard->tels[i].telnum);
}
silc_free(vcard->tels);
for (i = 0; i < vcard->num_emails; i++) {
vcard->org_unit ? vcard->org_unit : "");
if (vcard->categories)
fprintf(stream, "CATEGORIES:%s\n", vcard->categories);
- if (vcard->class)
- fprintf(stream, "CLASS:%s\n", vcard->class);
+ if (vcard->catclass)
+ fprintf(stream, "CLASS:%s\n", vcard->catclass);
if (vcard->url)
fprintf(stream, "URL:%s\n", vcard->url);
if (vcard->label)
for (i = 0; i < vcard->num_tels; i++) {
fprintf(stream, "TEL;TYPE=%s:%s\n",
vcard->tels[i].type,
- vcard->tels[i].tel ? vcard->tels[i].tel : "");
+ vcard->tels[i].telnum ? vcard->tels[i].telnum : "");
}
for (i = 0; i < vcard->num_emails; i++) {
fprintf(stream, "EMAIL;TYPE=%s:%s\n",