refactoring

This commit is contained in:
Berke Viktor 2011-11-30 08:59:40 +01:00
parent e488a0232a
commit b692172aa9
5 changed files with 42 additions and 42 deletions

View File

@ -137,16 +137,16 @@ struct _xchat_plugin
int flags); int flags);
void (*xchat_free) (xchat_plugin *ph, void (*xchat_free) (xchat_plugin *ph,
void *ptr); void *ptr);
int (*xchat_set_plugin_pref_str) (xchat_plugin *ph, int (*xchat_set_pluginpref_str) (xchat_plugin *ph,
char *var, char *var,
char *value); char *value);
int (*xchat_get_plugin_pref_str) (xchat_plugin *ph, int (*xchat_get_pluginpref_str) (xchat_plugin *ph,
char *var, char *var,
char *dest); char *dest);
int (*xchat_set_plugin_pref_int) (xchat_plugin *ph, int (*xchat_set_pluginpref_int) (xchat_plugin *ph,
char *var, char *var,
int value); int value);
int (*xchat_get_plugin_pref_int) (xchat_plugin *ph, int (*xchat_get_pluginpref_int) (xchat_plugin *ph,
char *var); char *var);
}; };
#endif #endif
@ -304,21 +304,21 @@ xchat_free (xchat_plugin *ph,
void *ptr); void *ptr);
int int
xchat_set_plugin_pref_str (xchat_plugin *ph, xchat_set_pluginpref_str (xchat_plugin *ph,
char *var, char *var,
char *value); char *value);
int int
xchat_get_plugin_pref_str (xchat_plugin *ph, xchat_get_pluginpref_str (xchat_plugin *ph,
char *var, char *var,
char *dest); char *dest);
int int
xchat_set_plugin_pref_int (xchat_plugin *ph, xchat_set_pluginpref_int (xchat_plugin *ph,
char *var, char *var,
int value); int value);
int int
xchat_get_plugin_pref_int (xchat_plugin *ph, xchat_get_pluginpref_int (xchat_plugin *ph,
char *var); char *var);
#if !defined(PLUGIN_C) && defined(WIN32) #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_send_modes ((XCHAT_PLUGIN_HANDLE)->xchat_send_modes)
#define xchat_strip ((XCHAT_PLUGIN_HANDLE)->xchat_strip) #define xchat_strip ((XCHAT_PLUGIN_HANDLE)->xchat_strip)
#define xchat_free ((XCHAT_PLUGIN_HANDLE)->xchat_free) #define xchat_free ((XCHAT_PLUGIN_HANDLE)->xchat_free)
#define xchat_set_plugin_pref_str ((XCHAT_PLUGIN_HANDLE)->xchat_set_plugin_pref_str) #define xchat_set_pluginpref_str ((XCHAT_PLUGIN_HANDLE)->xchat_set_pluginpref_str)
#define xchat_get_plugin_pref_str ((XCHAT_PLUGIN_HANDLE)->xchat_get_plugin_pref_str) #define xchat_get_pluginpref_str ((XCHAT_PLUGIN_HANDLE)->xchat_get_pluginpref_str)
#define xchat_set_plugin_pref_int ((XCHAT_PLUGIN_HANDLE)->xchat_set_plugin_pref_int) #define xchat_set_pluginpref_int ((XCHAT_PLUGIN_HANDLE)->xchat_set_pluginpref_int)
#define xchat_get_plugin_pref_int ((XCHAT_PLUGIN_HANDLE)->xchat_get_plugin_pref_int) #define xchat_get_pluginpref_int ((XCHAT_PLUGIN_HANDLE)->xchat_get_pluginpref_int)
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus

View File

@ -270,10 +270,10 @@ plugin_add (session *sess, char *filename, void *handle, void *init_func,
pl->xchat_send_modes = xchat_send_modes; pl->xchat_send_modes = xchat_send_modes;
pl->xchat_strip = xchat_strip; pl->xchat_strip = xchat_strip;
pl->xchat_free = xchat_free; pl->xchat_free = xchat_free;
pl->xchat_set_plugin_pref_str = xchat_set_plugin_pref_str; pl->xchat_set_pluginpref_str = xchat_set_pluginpref_str;
pl->xchat_get_plugin_pref_str = xchat_get_plugin_pref_str; pl->xchat_get_pluginpref_str = xchat_get_pluginpref_str;
pl->xchat_set_plugin_pref_int = xchat_set_plugin_pref_int; pl->xchat_set_pluginpref_int = xchat_set_pluginpref_int;
pl->xchat_get_plugin_pref_int = xchat_get_plugin_pref_int; pl->xchat_get_pluginpref_int = xchat_get_pluginpref_int;
/* incase new plugins are loaded on older xchat */ /* incase new plugins are loaded on older xchat */
pl->xchat_dummy4 = xchat_dummy; pl->xchat_dummy4 = xchat_dummy;
@ -1584,7 +1584,7 @@ xchat_free (xchat_plugin *ph, void *ptr)
} }
int 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; FILE *fpIn;
int fhOut; int fhOut;
@ -1680,7 +1680,7 @@ xchat_set_plugin_pref_str (xchat_plugin *pl, char *var, char *value)
} }
int 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 fh;
int l; int l;
@ -1732,20 +1732,20 @@ xchat_get_plugin_pref_str (xchat_plugin *pl, char *var, char *dest)
} }
int 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]; char buffer[12];
sprintf (buffer, "%d", value); sprintf (buffer, "%d", value);
return xchat_set_plugin_pref_str (pl, var, buffer); return xchat_set_pluginpref_str (pl, var, buffer);
} }
int int
xchat_get_plugin_pref_int (xchat_plugin *pl, char *var) xchat_get_pluginpref_int (xchat_plugin *pl, char *var)
{ {
char buffer[12]; char buffer[12];
if (xchat_get_plugin_pref_str (pl, var, buffer)) if (xchat_get_pluginpref_str (pl, var, buffer))
{ {
return atoi (buffer); return atoi (buffer);
} }

View File

@ -98,16 +98,16 @@ struct _xchat_plugin
int flags); int flags);
void (*xchat_free) (xchat_plugin *ph, void (*xchat_free) (xchat_plugin *ph,
void *ptr); void *ptr);
int (*xchat_set_plugin_pref_str) (xchat_plugin *ph, int (*xchat_set_pluginpref_str) (xchat_plugin *ph,
char *var, char *var,
char *value); char *value);
int (*xchat_get_plugin_pref_str) (xchat_plugin *ph, int (*xchat_get_pluginpref_str) (xchat_plugin *ph,
char *var, char *var,
char *dest); char *dest);
int (*xchat_set_plugin_pref_int) (xchat_plugin *ph, int (*xchat_set_pluginpref_int) (xchat_plugin *ph,
char *var, char *var,
int value); int value);
int (*xchat_get_plugin_pref_int) (xchat_plugin *ph, int (*xchat_get_pluginpref_int) (xchat_plugin *ph,
char *var); char *var);
void *(*xchat_dummy4) (xchat_plugin *ph); void *(*xchat_dummy4) (xchat_plugin *ph);
void *(*xchat_dummy3) (xchat_plugin *ph); void *(*xchat_dummy3) (xchat_plugin *ph);

View File

@ -137,16 +137,16 @@ struct _xchat_plugin
int flags); int flags);
void (*xchat_free) (xchat_plugin *ph, void (*xchat_free) (xchat_plugin *ph,
void *ptr); void *ptr);
int (*xchat_set_plugin_pref_str) (xchat_plugin *ph, int (*xchat_set_pluginpref_str) (xchat_plugin *ph,
char *var, char *var,
char *value); char *value);
int (*xchat_get_plugin_pref_str) (xchat_plugin *ph, int (*xchat_get_pluginpref_str) (xchat_plugin *ph,
char *var, char *var,
char *dest); char *dest);
int (*xchat_set_plugin_pref_int) (xchat_plugin *ph, int (*xchat_set_pluginpref_int) (xchat_plugin *ph,
char *var, char *var,
int value); int value);
int (*xchat_get_plugin_pref_int) (xchat_plugin *ph, int (*xchat_get_pluginpref_int) (xchat_plugin *ph,
char *var); char *var);
}; };
#endif #endif
@ -304,21 +304,21 @@ xchat_free (xchat_plugin *ph,
void *ptr); void *ptr);
int int
xchat_set_plugin_pref_str (xchat_plugin *ph, xchat_set_pluginpref_str (xchat_plugin *ph,
char *var, char *var,
char *value); char *value);
int int
xchat_get_plugin_pref_str (xchat_plugin *ph, xchat_get_pluginpref_str (xchat_plugin *ph,
char *var, char *var,
char *dest); char *dest);
int int
xchat_set_plugin_pref_int (xchat_plugin *ph, xchat_set_pluginpref_int (xchat_plugin *ph,
char *var, char *var,
int value); int value);
int int
xchat_get_plugin_pref_int (xchat_plugin *ph, xchat_get_pluginpref_int (xchat_plugin *ph,
char *var); char *var);
#if !defined(PLUGIN_C) && defined(WIN32) #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_send_modes ((XCHAT_PLUGIN_HANDLE)->xchat_send_modes)
#define xchat_strip ((XCHAT_PLUGIN_HANDLE)->xchat_strip) #define xchat_strip ((XCHAT_PLUGIN_HANDLE)->xchat_strip)
#define xchat_free ((XCHAT_PLUGIN_HANDLE)->xchat_free) #define xchat_free ((XCHAT_PLUGIN_HANDLE)->xchat_free)
#define xchat_set_plugin_pref_str ((XCHAT_PLUGIN_HANDLE)->xchat_set_plugin_pref_str) #define xchat_set_pluginpref_str ((XCHAT_PLUGIN_HANDLE)->xchat_set_pluginpref_str)
#define xchat_get_plugin_pref_str ((XCHAT_PLUGIN_HANDLE)->xchat_get_plugin_pref_str) #define xchat_get_pluginpref_str ((XCHAT_PLUGIN_HANDLE)->xchat_get_pluginpref_str)
#define xchat_set_plugin_pref_int ((XCHAT_PLUGIN_HANDLE)->xchat_set_plugin_pref_int) #define xchat_set_pluginpref_int ((XCHAT_PLUGIN_HANDLE)->xchat_set_pluginpref_int)
#define xchat_get_plugin_pref_int ((XCHAT_PLUGIN_HANDLE)->xchat_get_plugin_pref_int) #define xchat_get_pluginpref_int ((XCHAT_PLUGIN_HANDLE)->xchat_get_pluginpref_int)
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus

View File

@ -30,9 +30,9 @@ EXPORTED {
xchat_send_modes; xchat_send_modes;
xchat_strip; xchat_strip;
xchat_free; xchat_free;
xchat_set_plugin_pref_str; xchat_set_pluginpref_str;
xchat_get_plugin_pref_str; xchat_get_pluginpref_str;
xchat_set_plugin_pref_int; xchat_set_pluginpref_int;
xchat_get_plugin_pref_int; xchat_get_pluginpref_int;
local: *; local: *;
}; };