projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updates. New data types.
[silc.git]
/
lib
/
silccore
/
silcnotify.c
diff --git
a/lib/silccore/silcnotify.c
b/lib/silccore/silcnotify.c
index 210a3e1fb7d1ca198e3114fef725d266256b740b..a3f54556fa5ed1264509b351f330df1c15df02aa 100644
(file)
--- a/
lib/silccore/silcnotify.c
+++ b/
lib/silccore/silcnotify.c
@@
-39,7
+39,7
@@
struct SilcNotifyPayloadStruct {
SilcNotifyPayload silc_notify_payload_parse(SilcBuffer buffer)
{
SilcNotifyPayload new;
SilcNotifyPayload silc_notify_payload_parse(SilcBuffer buffer)
{
SilcNotifyPayload new;
- u
nsigned short
len;
+ u
int16
len;
int ret;
SILC_LOG_DEBUG(("Parsing Notify payload"));
int ret;
SILC_LOG_DEBUG(("Parsing Notify payload"));
@@
-72,27
+72,27
@@
SilcNotifyPayload silc_notify_payload_parse(SilcBuffer buffer)
/* Encode notify payload with variable argument list. If `argc' is > 0
argument payloads will be associated to the notify payload. Variable
/* Encode notify payload with variable argument list. If `argc' is > 0
argument payloads will be associated to the notify payload. Variable
- arguments must be {usigned char *, u
nsigned int
(len)}. */
+ arguments must be {usigned char *, u
int32
(len)}. */
-SilcBuffer silc_notify_payload_encode(SilcNotifyType type, u
nsigned int
argc,
+SilcBuffer silc_notify_payload_encode(SilcNotifyType type, u
int32
argc,
va_list ap)
{
SilcBuffer buffer;
SilcBuffer args = NULL;
unsigned char **argv;
va_list ap)
{
SilcBuffer buffer;
SilcBuffer args = NULL;
unsigned char **argv;
- u
nsigned int
*argv_lens = NULL, *argv_types = NULL;
+ u
int32
*argv_lens = NULL, *argv_types = NULL;
unsigned char *x;
unsigned char *x;
- u
nsigned int
x_len;
+ u
int32
x_len;
int i, k = 0, len = 0;
if (argc) {
argv = silc_calloc(argc, sizeof(unsigned char *));
int i, k = 0, len = 0;
if (argc) {
argv = silc_calloc(argc, sizeof(unsigned char *));
- argv_lens = silc_calloc(argc, sizeof(u
nsigned int
));
- argv_types = silc_calloc(argc, sizeof(u
nsigned int
));
+ argv_lens = silc_calloc(argc, sizeof(u
int32
));
+ argv_types = silc_calloc(argc, sizeof(u
int32
));
for (i = 0, k = 0; i < argc; i++) {
x = va_arg(ap, unsigned char *);
for (i = 0, k = 0; i < argc; i++) {
x = va_arg(ap, unsigned char *);
- x_len = va_arg(ap, u
nsigned int
);
+ x_len = va_arg(ap, u
int32
);
if (!x || !x_len)
continue;
if (!x || !x_len)
continue;
@@
-138,7
+138,7
@@
SilcBuffer silc_notify_payload_encode(SilcNotifyType type, unsigned int argc,
/* Same as above but takes argument from the `args' Argument Payload. */
SilcBuffer silc_notify_payload_encode_args(SilcNotifyType type,
/* Same as above but takes argument from the `args' Argument Payload. */
SilcBuffer silc_notify_payload_encode_args(SilcNotifyType type,
- u
nsigned int
argc,
+ u
int32
argc,
SilcBuffer args)
{
SilcBuffer buffer;
SilcBuffer args)
{
SilcBuffer buffer;
@@
-183,7
+183,7
@@
SilcNotifyType silc_notify_get_type(SilcNotifyPayload payload)
/* Return argument nums */
/* Return argument nums */
-u
nsigned int
silc_notify_get_arg_num(SilcNotifyPayload payload)
+u
int32
silc_notify_get_arg_num(SilcNotifyPayload payload)
{
return payload->argc;
}
{
return payload->argc;
}