From f31fc65e1d4c92119e82ac3a77acd30a5c080112 Mon Sep 17 00:00:00 2001 From: Jan Vidar Krey Date: Wed, 21 Dec 2011 01:42:21 +0100 Subject: [PATCH] VS2010 fixes. --- src/core/commands.c | 6 +++--- src/plugins/mod_auth_sqlite.c | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/core/commands.c b/src/core/commands.c index aa8c582..6c783e2 100644 --- a/src/core/commands.c +++ b/src/core/commands.c @@ -92,17 +92,17 @@ static void cbuf_append_bytes(struct command_buffer* buf, const char* msg, size_ static void cbuf_append(struct command_buffer* buf, const char* msg) { - uhub_assert(buf->flags == 0); size_t len = strlen(msg); + uhub_assert(buf->flags == 0); cbuf_append_bytes(buf, msg, len); } static void cbuf_append_format(struct command_buffer* buf, const char* format, ...) { - uhub_assert(buf->flags == 0); static char tmp[1024]; va_list args; int bytes; + uhub_assert(buf->flags == 0); va_start(args, format); bytes = vsnprintf(tmp, 1024, format, args); va_end(args); @@ -330,8 +330,8 @@ parse_arguments_error: static struct command_handle* command_get_handler(struct command_base* cbase, const char* prefix, const struct hub_user* user, struct hub_command* cmd) { - uhub_assert(cmd != NULL); struct command_handle* handler = NULL; + uhub_assert(cmd != NULL); if (prefix && prefix[0] && prefix[1]) { diff --git a/src/plugins/mod_auth_sqlite.c b/src/plugins/mod_auth_sqlite.c index 5d86579..5698e42 100644 --- a/src/plugins/mod_auth_sqlite.c +++ b/src/plugins/mod_auth_sqlite.c @@ -218,8 +218,9 @@ int plugin_register(struct plugin_handle* plugin, const char* config) int plugin_unregister(struct plugin_handle* plugin) { + struct sql_data* sql; set_error_message(plugin, 0); - struct sql_data* sql = (struct sql_data*) plugin->ptr; + sql = (struct sql_data*) plugin->ptr; sqlite3_close(sql->db); hub_free(sql); return 0;