From: Pekka Riikonen <priikone@silcnet.org>
Date: Mon, 18 Sep 2006 21:09:59 +0000 (+0000)
Subject: 	Use SILC_STR_ADVANCE.
X-Git-Tag: silc.client.1.1.beta1~267
X-Git-Url: http://git.silc.fi/gitweb/?a=commitdiff_plain;h=fc7cccf46583efae6580cae99f54a360f14a47dd;p=silc.git

	Use SILC_STR_ADVANCE.
---

diff --git a/lib/silchttp/silchttpphp.c b/lib/silchttp/silchttpphp.c
index 02f95e2c..f70b2acd 100644
--- a/lib/silchttp/silchttpphp.c
+++ b/lib/silchttp/silchttpphp.c
@@ -61,7 +61,7 @@ SilcBuffer silc_http_php_file(const char *filename)
   SilcBuffer ret = NULL;
   unsigned char tmp[8192];
   FILE *fd;
-  int len, off = 0;
+  int len;
 
   SILC_LOG_DEBUG(("Executing PHP"));
 
@@ -95,15 +95,19 @@ SilcBuffer silc_http_php_file(const char *filename)
       }
 
       silc_buffer_format(ret,
-			 SILC_STR_OFFSET(off),
-			 SILC_STR_UI_XNSTRING(tmp, len),
+			 SILC_STR_ADVANCE,
+			 SILC_STR_DATA(tmp, len),
 			 SILC_STR_END);
-      off += len;
     }
   } while (len);
 
-  if (ret)
-    silc_buffer_strformat(ret, "\0", SILC_STRFMT_END);
+  if (ret) {
+    silc_buffer_format(ret,
+		       SILC_STR_ADVANCE,
+		       SILC_STR_DATA('\0', 1),
+		       SILC_STR_END);
+    silc_buffer_push(ret, silc_buffer_truelen(ret));
+  }
 
   return ret;
 }