From a02befb6bfef34b0a037c87a67521dadf4aa90dc Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 29 Aug 2012 11:36:32 -0700 Subject: [PATCH] Rename plugin init. --- libguac/include/client.h | 8 ++++---- libguac/src/client.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libguac/include/client.h b/libguac/include/client.h index 842d549e..e6abd1cc 100644 --- a/libguac/include/client.h +++ b/libguac/include/client.h @@ -497,17 +497,17 @@ guac_client_plugin* guac_client_plugin_open(const char* protocol); int guac_client_plugin_close(guac_client_plugin* plugin); /** - * Initializes the given guac_client using the initialization routing provided + * Initializes the given guac_client using the initialization routine provided * by the given guac_client_plugin. * - * @param client The guac_client to initialize. * @param plugin The client plugin to use to initialize the new client. + * @param client The guac_client to initialize. * @param argc The number of arguments being passed to the client. * @param argv All arguments to be passed to the client. * @return Zero if initialization was successful, non-zero otherwise. */ -int guac_client_init(guac_client* client, - guac_client_plugin* plugin, int argc, char** argv); +int guac_client_plugin_init_client(guac_client_plugin* plugin, + guac_client* client, int argc, char** argv); /** * Returns a new, barebones guac_client. This new guac_client has no handlers diff --git a/libguac/src/client.c b/libguac/src/client.c index 3a685ec4..f5b6ccf1 100644 --- a/libguac/src/client.c +++ b/libguac/src/client.c @@ -242,8 +242,8 @@ int guac_client_plugin_close(guac_client_plugin* plugin) { } -int guac_client_init(guac_client* client, - guac_client_plugin* plugin, int argc, char** argv) { +int guac_client_plugin_init_client(guac_client_plugin* plugin, + guac_client* client, int argc, char** argv) { return plugin->init_handler(client, argc, argv);