Protocol version 1.2 integrations

[silc.git] / lib / silccore / silcargument.c

diff --git a/lib/silccore/silcargument.c b/lib/silccore/silcargument.c
index dd470a37dbc4ef704a7d6f55e9cc5a2d17250799..58ddbed9be2bb01c42da45073145edfe8adff7bb 100644 (file)
--- a/lib/silccore/silcargument.c
+++ b/lib/silccore/silcargument.c
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 2001 Pekka Riikonen
+  Copyright (C) 2001 - 2002 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
@@ -50,8 +50,6 @@ SilcArgumentPayload silc_argument_payload_parse(const unsigned char *payload,
   SilcUInt32 pull_len = 0;
   int i = 0, ret;
 
-  SILC_LOG_DEBUG(("Parsing argument payload"));
-
   silc_buffer_set(&buffer, (unsigned char *)payload, payload_len);
   newp = silc_calloc(1, sizeof(*newp));
   if (!newp)
@@ -95,8 +93,10 @@ SilcArgumentPayload silc_argument_payload_parse(const unsigned char *payload,
     pull_len += 3 + p_len;
   }
 
-  if (buffer.len != 0)
+  if (buffer.len != 0) {
+    SILC_LOG_DEBUG(("Malformed argument payload"));
     goto err;
+  }
 
   newp->argc = argc;
   newp->pos = 0;
@@ -106,6 +106,7 @@ SilcArgumentPayload silc_argument_payload_parse(const unsigned char *payload,
   return newp;
 
  err:
+  SILC_LOG_DEBUG(("Error parsing argument payload"));
   if (i)
     for (ret = 0; ret < i; ret++)
       silc_free(newp->argv[ret]);
@@ -129,8 +130,6 @@ SilcBuffer silc_argument_payload_encode(SilcUInt32 argc,
   SilcUInt32 len;
   int i;
 
-  SILC_LOG_DEBUG(("Encoding Argument payload"));
-
   len = 0;
   for (i = 0; i < argc; i++)
     len += 3 + argv_lens[i];
@@ -163,8 +162,6 @@ SilcBuffer silc_argument_payload_encode_payload(SilcArgumentPayload payload)
   SilcUInt32 len;
   int i;
 
-  SILC_LOG_DEBUG(("Encoding Argument payload"));
-
   len = 0;
   for (i = 0; i < payload->argc; i++)
     len += 3 + payload->argv_lens[i];