From b692172aa907243c7543015468da0fb077a9ac99 Mon Sep 17 00:00:00 2001 From: Berke Viktor Date: Wed, 30 Nov 2011 08:59:40 +0100 Subject: [PATCH] refactoring --- plugins/xchat-plugin.h | 24 ++++++++++++------------ src/common/plugin.c | 20 ++++++++++---------- src/common/plugin.h | 8 ++++---- src/common/xchat-plugin.h | 24 ++++++++++++------------ src/version-script | 8 ++++---- 5 files changed, 42 insertions(+), 42 deletions(-) diff --git a/plugins/xchat-plugin.h b/plugins/xchat-plugin.h index c278012a..48e3bc02 100644 --- a/plugins/xchat-plugin.h +++ b/plugins/xchat-plugin.h @@ -137,16 +137,16 @@ struct _xchat_plugin int flags); void (*xchat_free) (xchat_plugin *ph, void *ptr); - int (*xchat_set_plugin_pref_str) (xchat_plugin *ph, + int (*xchat_set_pluginpref_str) (xchat_plugin *ph, char *var, char *value); - int (*xchat_get_plugin_pref_str) (xchat_plugin *ph, + int (*xchat_get_pluginpref_str) (xchat_plugin *ph, char *var, char *dest); - int (*xchat_set_plugin_pref_int) (xchat_plugin *ph, + int (*xchat_set_pluginpref_int) (xchat_plugin *ph, char *var, int value); - int (*xchat_get_plugin_pref_int) (xchat_plugin *ph, + int (*xchat_get_pluginpref_int) (xchat_plugin *ph, char *var); }; #endif @@ -304,21 +304,21 @@ xchat_free (xchat_plugin *ph, void *ptr); int -xchat_set_plugin_pref_str (xchat_plugin *ph, +xchat_set_pluginpref_str (xchat_plugin *ph, char *var, char *value); int -xchat_get_plugin_pref_str (xchat_plugin *ph, +xchat_get_pluginpref_str (xchat_plugin *ph, char *var, char *dest); int -xchat_set_plugin_pref_int (xchat_plugin *ph, +xchat_set_pluginpref_int (xchat_plugin *ph, char *var, int value); int -xchat_get_plugin_pref_int (xchat_plugin *ph, +xchat_get_pluginpref_int (xchat_plugin *ph, char *var); #if !defined(PLUGIN_C) && defined(WIN32) @@ -355,10 +355,10 @@ xchat_get_plugin_pref_int (xchat_plugin *ph, #define xchat_send_modes ((XCHAT_PLUGIN_HANDLE)->xchat_send_modes) #define xchat_strip ((XCHAT_PLUGIN_HANDLE)->xchat_strip) #define xchat_free ((XCHAT_PLUGIN_HANDLE)->xchat_free) -#define xchat_set_plugin_pref_str ((XCHAT_PLUGIN_HANDLE)->xchat_set_plugin_pref_str) -#define xchat_get_plugin_pref_str ((XCHAT_PLUGIN_HANDLE)->xchat_get_plugin_pref_str) -#define xchat_set_plugin_pref_int ((XCHAT_PLUGIN_HANDLE)->xchat_set_plugin_pref_int) -#define xchat_get_plugin_pref_int ((XCHAT_PLUGIN_HANDLE)->xchat_get_plugin_pref_int) +#define xchat_set_pluginpref_str ((XCHAT_PLUGIN_HANDLE)->xchat_set_pluginpref_str) +#define xchat_get_pluginpref_str ((XCHAT_PLUGIN_HANDLE)->xchat_get_pluginpref_str) +#define xchat_set_pluginpref_int ((XCHAT_PLUGIN_HANDLE)->xchat_set_pluginpref_int) +#define xchat_get_pluginpref_int ((XCHAT_PLUGIN_HANDLE)->xchat_get_pluginpref_int) #endif #ifdef __cplusplus diff --git a/src/common/plugin.c b/src/common/plugin.c index d1493ccd..b5b10a0e 100644 --- a/src/common/plugin.c +++ b/src/common/plugin.c @@ -270,10 +270,10 @@ plugin_add (session *sess, char *filename, void *handle, void *init_func, pl->xchat_send_modes = xchat_send_modes; pl->xchat_strip = xchat_strip; pl->xchat_free = xchat_free; - pl->xchat_set_plugin_pref_str = xchat_set_plugin_pref_str; - pl->xchat_get_plugin_pref_str = xchat_get_plugin_pref_str; - pl->xchat_set_plugin_pref_int = xchat_set_plugin_pref_int; - pl->xchat_get_plugin_pref_int = xchat_get_plugin_pref_int; + pl->xchat_set_pluginpref_str = xchat_set_pluginpref_str; + pl->xchat_get_pluginpref_str = xchat_get_pluginpref_str; + pl->xchat_set_pluginpref_int = xchat_set_pluginpref_int; + pl->xchat_get_pluginpref_int = xchat_get_pluginpref_int; /* incase new plugins are loaded on older xchat */ pl->xchat_dummy4 = xchat_dummy; @@ -1584,7 +1584,7 @@ xchat_free (xchat_plugin *ph, void *ptr) } int -xchat_set_plugin_pref_str (xchat_plugin *pl, char *var, char *value) +xchat_set_pluginpref_str (xchat_plugin *pl, char *var, char *value) { FILE *fpIn; int fhOut; @@ -1680,7 +1680,7 @@ xchat_set_plugin_pref_str (xchat_plugin *pl, char *var, char *value) } int -xchat_get_plugin_pref_str (xchat_plugin *pl, char *var, char *dest) +xchat_get_pluginpref_str (xchat_plugin *pl, char *var, char *dest) { int fh; int l; @@ -1732,20 +1732,20 @@ xchat_get_plugin_pref_str (xchat_plugin *pl, char *var, char *dest) } int -xchat_set_plugin_pref_int (xchat_plugin *pl, char *var, int value) +xchat_set_pluginpref_int (xchat_plugin *pl, char *var, int value) { char buffer[12]; sprintf (buffer, "%d", value); - return xchat_set_plugin_pref_str (pl, var, buffer); + return xchat_set_pluginpref_str (pl, var, buffer); } int -xchat_get_plugin_pref_int (xchat_plugin *pl, char *var) +xchat_get_pluginpref_int (xchat_plugin *pl, char *var) { char buffer[12]; - if (xchat_get_plugin_pref_str (pl, var, buffer)) + if (xchat_get_pluginpref_str (pl, var, buffer)) { return atoi (buffer); } diff --git a/src/common/plugin.h b/src/common/plugin.h index f0ae6fc4..858ed815 100644 --- a/src/common/plugin.h +++ b/src/common/plugin.h @@ -98,16 +98,16 @@ struct _xchat_plugin int flags); void (*xchat_free) (xchat_plugin *ph, void *ptr); - int (*xchat_set_plugin_pref_str) (xchat_plugin *ph, + int (*xchat_set_pluginpref_str) (xchat_plugin *ph, char *var, char *value); - int (*xchat_get_plugin_pref_str) (xchat_plugin *ph, + int (*xchat_get_pluginpref_str) (xchat_plugin *ph, char *var, char *dest); - int (*xchat_set_plugin_pref_int) (xchat_plugin *ph, + int (*xchat_set_pluginpref_int) (xchat_plugin *ph, char *var, int value); - int (*xchat_get_plugin_pref_int) (xchat_plugin *ph, + int (*xchat_get_pluginpref_int) (xchat_plugin *ph, char *var); void *(*xchat_dummy4) (xchat_plugin *ph); void *(*xchat_dummy3) (xchat_plugin *ph); diff --git a/src/common/xchat-plugin.h b/src/common/xchat-plugin.h index c278012a..48e3bc02 100644 --- a/src/common/xchat-plugin.h +++ b/src/common/xchat-plugin.h @@ -137,16 +137,16 @@ struct _xchat_plugin int flags); void (*xchat_free) (xchat_plugin *ph, void *ptr); - int (*xchat_set_plugin_pref_str) (xchat_plugin *ph, + int (*xchat_set_pluginpref_str) (xchat_plugin *ph, char *var, char *value); - int (*xchat_get_plugin_pref_str) (xchat_plugin *ph, + int (*xchat_get_pluginpref_str) (xchat_plugin *ph, char *var, char *dest); - int (*xchat_set_plugin_pref_int) (xchat_plugin *ph, + int (*xchat_set_pluginpref_int) (xchat_plugin *ph, char *var, int value); - int (*xchat_get_plugin_pref_int) (xchat_plugin *ph, + int (*xchat_get_pluginpref_int) (xchat_plugin *ph, char *var); }; #endif @@ -304,21 +304,21 @@ xchat_free (xchat_plugin *ph, void *ptr); int -xchat_set_plugin_pref_str (xchat_plugin *ph, +xchat_set_pluginpref_str (xchat_plugin *ph, char *var, char *value); int -xchat_get_plugin_pref_str (xchat_plugin *ph, +xchat_get_pluginpref_str (xchat_plugin *ph, char *var, char *dest); int -xchat_set_plugin_pref_int (xchat_plugin *ph, +xchat_set_pluginpref_int (xchat_plugin *ph, char *var, int value); int -xchat_get_plugin_pref_int (xchat_plugin *ph, +xchat_get_pluginpref_int (xchat_plugin *ph, char *var); #if !defined(PLUGIN_C) && defined(WIN32) @@ -355,10 +355,10 @@ xchat_get_plugin_pref_int (xchat_plugin *ph, #define xchat_send_modes ((XCHAT_PLUGIN_HANDLE)->xchat_send_modes) #define xchat_strip ((XCHAT_PLUGIN_HANDLE)->xchat_strip) #define xchat_free ((XCHAT_PLUGIN_HANDLE)->xchat_free) -#define xchat_set_plugin_pref_str ((XCHAT_PLUGIN_HANDLE)->xchat_set_plugin_pref_str) -#define xchat_get_plugin_pref_str ((XCHAT_PLUGIN_HANDLE)->xchat_get_plugin_pref_str) -#define xchat_set_plugin_pref_int ((XCHAT_PLUGIN_HANDLE)->xchat_set_plugin_pref_int) -#define xchat_get_plugin_pref_int ((XCHAT_PLUGIN_HANDLE)->xchat_get_plugin_pref_int) +#define xchat_set_pluginpref_str ((XCHAT_PLUGIN_HANDLE)->xchat_set_pluginpref_str) +#define xchat_get_pluginpref_str ((XCHAT_PLUGIN_HANDLE)->xchat_get_pluginpref_str) +#define xchat_set_pluginpref_int ((XCHAT_PLUGIN_HANDLE)->xchat_set_pluginpref_int) +#define xchat_get_pluginpref_int ((XCHAT_PLUGIN_HANDLE)->xchat_get_pluginpref_int) #endif #ifdef __cplusplus diff --git a/src/version-script b/src/version-script index 94a95a0b..e76f4fe9 100644 --- a/src/version-script +++ b/src/version-script @@ -30,9 +30,9 @@ EXPORTED { xchat_send_modes; xchat_strip; xchat_free; - xchat_set_plugin_pref_str; - xchat_get_plugin_pref_str; - xchat_set_plugin_pref_int; - xchat_get_plugin_pref_int; + xchat_set_pluginpref_str; + xchat_get_pluginpref_str; + xchat_set_pluginpref_int; + xchat_get_pluginpref_int; local: *; };