X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=apps%2Fsilc%2Fclient_ops.c;h=19dbb519c25741e10976790412e86d85af51061d;hp=c027c147df9a7449904f252cc68bb3e2313d1717;hb=a818c5b5411bbc4436d1c5f011236985c96bb787;hpb=7910ce2a5c55211a4ea09a52832c6ed32c0b64fd diff --git a/apps/silc/client_ops.c b/apps/silc/client_ops.c index c027c147..19dbb519 100644 --- a/apps/silc/client_ops.c +++ b/apps/silc/client_ops.c @@ -23,7 +23,7 @@ static bool silc_verify_public_key_internal(SilcClient client, SilcClientConnection conn, SilcSocketType conn_type, unsigned char *pk, - uint32 pk_len, SilcSKEPKType pk_type) + SilcUInt32 pk_len, SilcSKEPKType pk_type) { int i; char file[256], filename[256], *fingerprint; @@ -89,7 +89,7 @@ silc_verify_public_key_internal(SilcClient client, SilcClientConnection conn, /* The key already exists, verify it. */ SilcPublicKey public_key; unsigned char *encpk; - uint32 encpk_len; + SilcUInt32 encpk_len; /* Load the key file */ if (!silc_pkcs_load_public_key(filename, &public_key, @@ -279,7 +279,7 @@ void silc_notify(SilcClient client, SilcClientConnection conn, SilcClientEntry client_entry, client_entry2; SilcChannelEntry channel_entry; char *tmp = NULL; - uint32 tmp_int; + SilcUInt32 tmp_int; va_start(vp, type); @@ -376,7 +376,7 @@ void silc_notify(SilcClient client, SilcClientConnection conn, case SILC_NOTIFY_TYPE_CMODE_CHANGE: client_entry = va_arg(vp, SilcClientEntry); - tmp_int = va_arg(vp, uint32); + tmp_int = va_arg(vp, SilcUInt32); (void)va_arg(vp, char *); (void)va_arg(vp, char *); channel_entry = va_arg(vp, SilcChannelEntry); @@ -412,7 +412,7 @@ void silc_notify(SilcClient client, SilcClientConnection conn, case SILC_NOTIFY_TYPE_CUMODE_CHANGE: client_entry = va_arg(vp, SilcClientEntry); - tmp_int = va_arg(vp, uint32); + tmp_int = va_arg(vp, SilcUInt32); tmp = silc_client_chumode(tmp_int); client_entry2 = va_arg(vp, SilcClientEntry); channel_entry = va_arg(vp, SilcChannelEntry); @@ -501,12 +501,12 @@ void silc_notify(SilcClient client, SilcClientConnection conn, case SILC_NOTIFY_TYPE_SERVER_SIGNOFF: { SilcClientEntry *clients; - uint32 clients_count; + SilcUInt32 clients_count; int i; (void)va_arg(vp, void *); clients = va_arg(vp, SilcClientEntry *); - clients_count = va_arg(vp, uint32); + clients_count = va_arg(vp, SilcUInt32); for (i = 0; i < clients_count; i++) { if (clients[i]->server) @@ -571,7 +571,7 @@ void silc_command(SilcClient client, SilcClientConnection conn, void silc_client_show_users(SilcClient client, SilcClientConnection conn, SilcClientEntry *clients, - uint32 clients_count, + SilcUInt32 clients_count, void *context) { SilcChannelEntry channel = (SilcChannelEntry)context; @@ -647,7 +647,7 @@ void silc_command_reply(SilcClient client, SilcClientConnection conn, { char buf[1024], *nickname, *username, *realname; int len; - uint32 idle, mode; + SilcUInt32 idle, mode; SilcBuffer channels; if (status == SILC_STATUS_ERR_NO_SUCH_NICK || @@ -672,8 +672,8 @@ void silc_command_reply(SilcClient client, SilcClientConnection conn, username = va_arg(vp, char *); realname = va_arg(vp, char *); channels = va_arg(vp, SilcBuffer); - mode = va_arg(vp, uint32); - idle = va_arg(vp, uint32); + mode = va_arg(vp, SilcUInt32); + idle = va_arg(vp, SilcUInt32); memset(buf, 0, sizeof(buf)); @@ -706,7 +706,7 @@ void silc_command_reply(SilcClient client, SilcClientConnection conn, silc_dlist_start(list); while ((entry = silc_dlist_get(list)) != SILC_LIST_END) { char *m = silc_client_chumode_char(silc_channel_get_mode(entry)); - uint32 name_len; + SilcUInt32 name_len; char *name = silc_channel_get_name(entry, &name_len); if (m) @@ -813,10 +813,10 @@ void silc_command_reply(SilcClient client, SilcClientConnection conn, case SILC_COMMAND_JOIN: { - uint32 mode; + SilcUInt32 mode; char *topic; SilcBuffer client_id_list; - uint32 list_count; + SilcUInt32 list_count; SilcChannelEntry channel; if (!success) @@ -824,14 +824,14 @@ void silc_command_reply(SilcClient client, SilcClientConnection conn, app->screen->bottom_line->channel = va_arg(vp, char *); channel = va_arg(vp, SilcChannelEntry); - mode = va_arg(vp, uint32); - (void)va_arg(vp, uint32); + mode = va_arg(vp, SilcUInt32); + (void)va_arg(vp, SilcUInt32); (void)va_arg(vp, unsigned char *); (void)va_arg(vp, unsigned char *); (void)va_arg(vp, unsigned char *); topic = va_arg(vp, char *); (void)va_arg(vp, unsigned char *); - list_count = va_arg(vp, uint32); + list_count = va_arg(vp, SilcUInt32); client_id_list = va_arg(vp, SilcBuffer); if (topic) @@ -916,12 +916,12 @@ void silc_command_reply(SilcClient client, SilcClientConnection conn, case SILC_COMMAND_UMODE: { - uint32 mode; + SilcUInt32 mode; if (!success) return; - mode = va_arg(vp, uint32); + mode = va_arg(vp, SilcUInt32); if (!mode && app->screen->bottom_line->umode) { silc_free(app->screen->bottom_line->umode); @@ -1075,9 +1075,9 @@ void silc_command_reply(SilcClient client, SilcClientConnection conn, void *entry; SilcPublicKey public_key; unsigned char *pk; - uint32 pk_len; + SilcUInt32 pk_len; - id_type = va_arg(vp, uint32); + id_type = va_arg(vp, SilcUInt32); entry = va_arg(vp, void *); public_key = va_arg(vp, SilcPublicKey); @@ -1193,7 +1193,7 @@ void silc_ask_passphrase(SilcClient client, SilcClientConnection conn, void silc_verify_public_key(SilcClient client, SilcClientConnection conn, SilcSocketType conn_type, unsigned char *pk, - uint32 pk_len, SilcSKEPKType pk_type, + SilcUInt32 pk_len, SilcSKEPKType pk_type, SilcVerifyPublicKey completion, void *context) { if (silc_verify_public_key_internal(client, conn, conn_type, pk, @@ -1212,10 +1212,10 @@ void silc_verify_public_key(SilcClient client, SilcClientConnection conn, is found and FALSE if not. `conn' may be NULL. */ int silc_get_auth_method(SilcClient client, SilcClientConnection conn, - char *hostname, uint16 port, + char *hostname, SilcUInt16 port, SilcProtocolAuthMeth *auth_meth, unsigned char **auth_data, - uint32 *auth_data_len) + SilcUInt32 *auth_data_len) { SilcClientInternal app = (SilcClientInternal)client->application; @@ -1285,7 +1285,7 @@ void silc_failure(SilcClient client, SilcClientConnection conn, } if (protocol->protocol->type == SILC_PROTOCOL_CLIENT_CONNECTION_AUTH) { - uint32 err = (uint32)failure; + SilcUInt32 err = (SilcUInt32)failure; if (err == SILC_AUTH_FAILED) silc_say(client, conn, "Authentication failed");