X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilccore%2Fsilccommand.c;h=d8470570c205f7cb363b0d0b7d093db4138bf295;hb=48df45ce74e38c47a8a05a5dcb3b57a61eeb0b5d;hp=20b90c66535918c43917306e7d59d03f5109aeef;hpb=0e035ff559c5c5c748b2fda72a1cd1935afec33a;p=silc.git diff --git a/lib/silccore/silccommand.c b/lib/silccore/silccommand.c index 20b90c66..d8470570 100644 --- a/lib/silccore/silccommand.c +++ b/lib/silccore/silccommand.c @@ -271,8 +271,8 @@ SilcBuffer silc_command_payload_encode_vap(SilcCommand cmd, SilcBuffer silc_command_reply_payload_encode_va(SilcCommand cmd, - SilcCommandStatus status, - SilcCommandStatus error, + SilcStatus status, + SilcStatus error, SilcUInt16 ident, SilcUInt32 argc, ...) { @@ -289,8 +289,8 @@ silc_command_reply_payload_encode_va(SilcCommand cmd, SilcBuffer silc_command_reply_payload_encode_vap(SilcCommand cmd, - SilcCommandStatus status, - SilcCommandStatus error, + SilcStatus status, + SilcStatus error, SilcUInt16 ident, SilcUInt32 argc, va_list ap) { @@ -394,8 +394,8 @@ SilcUInt16 silc_command_get_ident(SilcCommandPayload payload) /* Return command status */ bool silc_command_get_status(SilcCommandPayload payload, - SilcCommandStatus *status, - SilcCommandStatus *error) + SilcStatus *status, + SilcStatus *error) { unsigned char *tmp; SilcUInt32 tmp_len; @@ -409,7 +409,7 @@ bool silc_command_get_status(SilcCommandPayload payload, /* Check for 1.0 protocol version which didn't have `error' */ if (tmp[0] == 0 && tmp[1] != 0) { /* Protocol 1.0 version */ - SilcCommandStatus s; + SilcStatus s; SILC_GET16_MSB(s, tmp); if (status) *status = s; @@ -422,9 +422,9 @@ bool silc_command_get_status(SilcCommandPayload payload, /* Take both status and possible error */ if (status) - *status = (SilcCommandStatus)tmp[0]; + *status = (SilcStatus)tmp[0]; if (error) - *error = (SilcCommandStatus)tmp[1]; + *error = (SilcStatus)tmp[1]; /* If single error occurred have the both `status' and `error' indicate the error value for convenience. */