Tetsuro IKEDA
null+****@clear*****
Thu Oct 4 10:29:31 JST 2012
Tetsuro IKEDA 2009-06-18 14:05:44 +0900 (Thu, 18 Jun 2009) New Revision: beaf8e971d3ca42183f2449c10d0e93e0320bc5b https://github.com/mroonga/mroonga/commit/beaf8e971d3ca42183f2449c10d0e93e0320bc5b Log: change signature of mrn_init/mrn_deinit. add mrn_plugin_deinit. Modified files: driver.c driver.h ha_groonga.cc Modified: driver.c (+2 -2) =================================================================== --- driver.c 2009-06-18 11:32:20 +0900 (a9084e5) +++ driver.c 2009-06-18 14:05:44 +0900 (750069d) @@ -41,7 +41,7 @@ int mrn_flush_logs() return 0; } -int mrn_init(void *p) +int mrn_init() { /* libgroonga init */ grn_init(); @@ -72,7 +72,7 @@ int mrn_init(void *p) /* TODO: release all grn_obj in global hash */ -int mrn_deinit(void *p) +int mrn_deinit() { mrn_ctx_init(); MRN_TRACE; Modified: driver.h (+2 -2) =================================================================== --- driver.h 2009-06-18 11:32:20 +0900 (727eadd) +++ driver.h 2009-06-18 14:05:44 +0900 (2000508) @@ -64,8 +64,8 @@ typedef struct _mrn_share { snprintf(buf,MRN_MAX_KEY_LEN-1, "%s/%s.%s%s", db, table, column, MRN_FILE_EXT) /* functions */ -int mrn_init(void *p); -int mrn_deinit(void *p); +int mrn_init(); +int mrn_deinit(); void mrn_logger_func(int level, const char *time, const char *title, const char *msg, const char *location, void *func_arg); int mrn_flush_logs(); Modified: ha_groonga.cc (+7 -2) =================================================================== --- ha_groonga.cc 2009-06-18 11:32:20 +0900 (1431541) +++ ha_groonga.cc 2009-06-18 14:05:44 +0900 (ce3b339) @@ -91,7 +91,12 @@ int mrn_plugin_init(void *p) hton->create = mrn_handler_create; hton->flush_logs = mrn_plugin_flush_logs; hton->flags = 0; - mrn_init(NULL); + return mrn_init(); +} + +int mrn_plugin_deinit(void *p) +{ + return mrn_deinit(); } @@ -107,7 +112,7 @@ mysql_declare_plugin(mroonga) "MySQL binding for Groonga", PLUGIN_LICENSE_BSD, mrn_plugin_init, - mrn_deinit, + mrn_plugin_deinit, 0x0001, NULL, NULL, -------------- next part -------------- HTML����������������������������...Télécharger
