X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilccore%2Fsilcnotify.c;h=4f6feacbda0a14c42aaff2f1d3c0dc8196b7fd1e;hb=40f8443d8d3a6577336ee66d18e04d9ac4d956bb;hp=20a42e9e863c8ac7c8853a57163b346002e7e944;hpb=790ab3b8c18b2b491843cf08308d2394f581cb59;p=silc.git

diff --git a/lib/silccore/silcnotify.c b/lib/silccore/silcnotify.c
index 20a42e9e..4f6feacb 100644
--- a/lib/silccore/silcnotify.c
+++ b/lib/silccore/silcnotify.c
@@ -2,15 +2,14 @@
 
   silcnotify.c
 
-  Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
+  Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 2000 Pekka Riikonen
+  Copyright (C) 2000 - 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
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-  
+  the Free Software Foundation; version 2 of the License.
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -19,7 +18,7 @@
 */
 /* $Id$ */
 
-#include "silcincludes.h"
+#include "silc.h"
 #include "silcnotify.h"
 
 /******************************************************************************
@@ -59,12 +58,12 @@ SilcNotifyPayload silc_notify_payload_parse(const unsigned char *payload,
   if (ret == -1)
     goto err;
 
-  if (len > buffer.len)
+  if (len > silc_buffer_len(&buffer))
     goto err;
 
   if (newp->argc) {
     silc_buffer_pull(&buffer, 5);
-    newp->args = silc_argument_payload_parse(buffer.data, buffer.len, 
+    newp->args = silc_argument_payload_parse(buffer.data, silc_buffer_len(&buffer),
 					     newp->argc);
     silc_buffer_push(&buffer, 5);
   }
@@ -80,7 +79,7 @@ SilcNotifyPayload silc_notify_payload_parse(const unsigned char *payload,
    argument payloads will be associated to the notify payload. Variable
    arguments must be {usigned char *, SilcUInt32 (len)}. */
 
-SilcBuffer silc_notify_payload_encode(SilcNotifyType type, SilcUInt32 argc, 
+SilcBuffer silc_notify_payload_encode(SilcNotifyType type, SilcUInt32 argc,
 				      va_list ap)
 {
   SilcBuffer buffer;
@@ -88,8 +87,8 @@ SilcBuffer silc_notify_payload_encode(SilcNotifyType type, SilcUInt32 argc,
   unsigned char **argv;
   SilcUInt32 *argv_lens = NULL, *argv_types = NULL;
   unsigned char *x;
-  SilcUInt32 x_len;
-  int i, k = 0, len = 0;
+  SilcUInt32 x_len, len = 0;
+  int i, k = 0;
 
   if (argc) {
     argv = silc_calloc(argc, sizeof(unsigned char *));
@@ -106,14 +105,14 @@ SilcBuffer silc_notify_payload_encode(SilcNotifyType type, SilcUInt32 argc,
       silc_free(argv);
       return NULL;
     }
-    
+
     for (i = 0, k = 0; i < argc; i++) {
       x = va_arg(ap, unsigned char *);
       x_len = va_arg(ap, SilcUInt32);
 
       if (!x || !x_len)
 	continue;
-      
+
       argv[k] = silc_memdup(x, x_len);
       if (!argv[k])
 	return NULL;
@@ -123,7 +122,7 @@ SilcBuffer silc_notify_payload_encode(SilcNotifyType type, SilcUInt32 argc,
     }
 
     args = silc_argument_payload_encode(k, argv, argv_lens, argv_types);
-    len = args->len;
+    len = silc_buffer_len(args);
 
     for (i = 0; i < k; i++)
       silc_free(argv[i]);
@@ -145,7 +144,7 @@ SilcBuffer silc_notify_payload_encode(SilcNotifyType type, SilcUInt32 argc,
   if (k) {
     silc_buffer_pull(buffer, 5);
     silc_buffer_format(buffer,
-		       SILC_STR_UI_XNSTRING(args->data, args->len),
+		       SILC_STR_UI_XNSTRING(args->data, silc_buffer_len(args)),
 		       SILC_STR_END);
     silc_buffer_push(buffer, 5);
     silc_buffer_free(args);
@@ -156,14 +155,14 @@ SilcBuffer silc_notify_payload_encode(SilcNotifyType type, SilcUInt32 argc,
 
 /* Same as above but takes argument from the `args' Argument Payload. */
 
-SilcBuffer silc_notify_payload_encode_args(SilcNotifyType type, 
+SilcBuffer silc_notify_payload_encode_args(SilcNotifyType type,
 					   SilcUInt32 argc,
 					   SilcBuffer args)
 {
   SilcBuffer buffer;
-  int len;
+  SilcUInt32 len;
 
-  len = 5 + (args ? args->len : 0);
+  len = 5 + (args ? silc_buffer_len(args) : 0);
   buffer = silc_buffer_alloc_size(len);
   if (!buffer)
     return NULL;
@@ -176,7 +175,7 @@ SilcBuffer silc_notify_payload_encode_args(SilcNotifyType type,
   if (args) {
     silc_buffer_pull(buffer, 5);
     silc_buffer_format(buffer,
-		       SILC_STR_UI_XNSTRING(args->data, args->len),
+		       SILC_STR_UI_XNSTRING(args->data, silc_buffer_len(args)),
 		       SILC_STR_END);
     silc_buffer_push(buffer, 5);
   }