projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial code commit for Toolkit 1.1.
[silc.git]
/
lib
/
silccore
/
silcargument.c
diff --git
a/lib/silccore/silcargument.c
b/lib/silccore/silcargument.c
index 9c088b51cd67fb3b94311e7d193e3c26d8a4314b..4fe9b7c41ed0c3cc4724b3815d64e7b1e1076f74 100644
(file)
--- a/
lib/silccore/silcargument.c
+++ b/
lib/silccore/silcargument.c
@@
-1,10
+1,10
@@
/*
/*
- silcargument.c
+ silcargument.c
Author: Pekka Riikonen <priikone@silcnet.org>
Author: Pekka Riikonen <priikone@silcnet.org>
- Copyright (C) 2001 - 200
2
Pekka Riikonen
+ Copyright (C) 2001 - 200
5
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
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
@@
-16,7
+16,7
@@
GNU General Public License for more details.
*/
GNU General Public License for more details.
*/
-/* Implementation of Argument Payload routines */
+/* Implementation of Argument Payload routines */
/* $Id$ */
#include "silcincludes.h"
/* $Id$ */
#include "silcincludes.h"
@@
-63,7
+63,7
@@
SilcArgumentPayload silc_argument_payload_parse(const unsigned char *payload,
newp->argv_types = silc_calloc(argc, sizeof(SilcUInt32));
if (!newp->argv_types)
goto err;
newp->argv_types = silc_calloc(argc, sizeof(SilcUInt32));
if (!newp->argv_types)
goto err;
-
+
/* Get arguments */
arg_num = 1;
for (i = 0; i < argc; i++) {
/* Get arguments */
arg_num = 1;
for (i = 0; i < argc; i++) {
@@
-71,7
+71,7
@@
SilcArgumentPayload silc_argument_payload_parse(const unsigned char *payload,
SILC_STR_UI_SHORT(&p_len),
SILC_STR_UI_CHAR(&arg_type),
SILC_STR_END);
SILC_STR_UI_SHORT(&p_len),
SILC_STR_UI_CHAR(&arg_type),
SILC_STR_END);
- if (ret == -1 || p_len >
buffer.len
- 3)
+ if (ret == -1 || p_len >
silc_buffer_len(&buffer)
- 3)
goto err;
newp->argv_lens[i] = p_len;
goto err;
newp->argv_lens[i] = p_len;
@@
-80,7
+80,7
@@
SilcArgumentPayload silc_argument_payload_parse(const unsigned char *payload,
/* Get argument data */
silc_buffer_pull(&buffer, 3);
ret = silc_buffer_unformat(&buffer,
/* Get argument data */
silc_buffer_pull(&buffer, 3);
ret = silc_buffer_unformat(&buffer,
- SILC_STR_UI_XNSTRING_ALLOC(&newp->argv[i],
+ SILC_STR_UI_XNSTRING_ALLOC(&newp->argv[i],
p_len),
SILC_STR_END);
if (ret == -1)
p_len),
SILC_STR_END);
if (ret == -1)
@@
-90,7
+90,7
@@
SilcArgumentPayload silc_argument_payload_parse(const unsigned char *payload,
pull_len += 3 + p_len;
}
pull_len += 3 + p_len;
}
- if (
buffer.len
!= 0) {
+ if (
silc_buffer_len(&buffer)
!= 0) {
SILC_LOG_DEBUG(("Malformed argument payload"));
goto err;
}
SILC_LOG_DEBUG(("Malformed argument payload"));
goto err;
}
@@
-162,12
+162,12
@@
SilcBuffer silc_argument_payload_encode_one(SilcBuffer args,
len = 3 + (SilcUInt16)arg_len;
buffer = silc_buffer_realloc(buffer,
len = 3 + (SilcUInt16)arg_len;
buffer = silc_buffer_realloc(buffer,
- (buffer ?
buffer->truelen
+ len : len));
+ (buffer ?
silc_buffer_truelen(buffer)
+ len : len));
if (!buffer)
return NULL;
if (!buffer)
return NULL;
- silc_buffer_pull(buffer,
buffer->len
);
+ silc_buffer_pull(buffer,
silc_buffer_len(buffer)
);
silc_buffer_pull_tail(buffer, len);
silc_buffer_pull_tail(buffer, len);
- silc_buffer_format(buffer,
+ silc_buffer_format(buffer,
SILC_STR_UI_SHORT(arg_len),
SILC_STR_UI_CHAR(arg_type),
SILC_STR_UI_XNSTRING(arg, (SilcUInt16)arg_len),
SILC_STR_UI_SHORT(arg_len),
SILC_STR_UI_CHAR(arg_type),
SILC_STR_UI_XNSTRING(arg, (SilcUInt16)arg_len),
@@
-199,7
+199,7
@@
SilcBuffer silc_argument_payload_encode_payload(SilcArgumentPayload payload)
silc_buffer_format(buffer,
SILC_STR_UI_SHORT(payload->argv_lens[i]),
SILC_STR_UI_CHAR(payload->argv_types[i]),
silc_buffer_format(buffer,
SILC_STR_UI_SHORT(payload->argv_lens[i]),
SILC_STR_UI_CHAR(payload->argv_types[i]),
- SILC_STR_UI_XNSTRING(payload->argv[i],
+ SILC_STR_UI_XNSTRING(payload->argv[i],
payload->argv_lens[i]),
SILC_STR_END);
silc_buffer_pull(buffer, 3 + payload->argv_lens[i]);
payload->argv_lens[i]),
SILC_STR_END);
silc_buffer_pull(buffer, 3 + payload->argv_lens[i]);