X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcutil%2Fsilcvcard.c;h=dad057e1f3a038671e8c2b6c67adce3d1672940f;hb=40f8443d8d3a6577336ee66d18e04d9ac4d956bb;hp=a6d6fd5bd655e33ccbdf99bf51241553e31a5b4e;hpb=382d15d447b7a95390decfa783836ae4fe255b3d;p=silc.git

diff --git a/lib/silcutil/silcvcard.c b/lib/silcutil/silcvcard.c
index a6d6fd5b..dad057e1 100644
--- a/lib/silcutil/silcvcard.c
+++ b/lib/silcutil/silcvcard.c
@@ -1,10 +1,10 @@
 /*
 
-  silcvcard.c 
+  silcvcard.c
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 2002 Pekka Riikonen
+  Copyright (C) 2002 - 2005 Pekka Riikonen
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 /* $Id$ */
 /* Implementation of the VCard (RFC 2426) */
 
-#include "silcincludes.h"
+#include "silc.h"
 
 #define VCARD_HEADER "BEGIN:VCARD\n"
 #define VCARD_VERSION "VERSION:3.0\n"
@@ -43,44 +43,44 @@ unsigned char *silc_vcard_encode(SilcVCard vcard, SilcUInt32 *vcard_len)
        "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);
+			  SILC_STRFMT_END);
   if (vcard->catclass)
     silc_buffer_strformat(&buffer,
 			  "CLASS:", vcard->catclass, "\n",
-			  SILC_STR_END);
+			  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=",
@@ -92,35 +92,35 @@ unsigned char *silc_vcard_encode(SilcVCard vcard, SilcUInt32 *vcard_len)
 			  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].telnum, "\n",
-			  SILC_STR_END);
+			  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;
+    *vcard_len = silc_buffer_truelen(&buffer);
 
   return buffer.head;
 }
@@ -168,13 +168,13 @@ do {							\
 
 /* Decode VCard */
 
-bool silc_vcard_decode(const unsigned char *data, SilcUInt32 data_len,
+SilcBool silc_vcard_decode(const unsigned char *data, SilcUInt32 data_len,
 		       SilcVCard vcard)
 {
   unsigned char *val;
-  bool has_begin = FALSE, has_end = FALSE;
+  SilcBool has_begin = FALSE, has_end = FALSE;
   int len, i, off = 0;
-  
+
   val = (unsigned char *)data;
   while (val) {
     len = 0;