philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove six dll_ variables from the module exports table

Browse Source 
The removed variables are:

	dll_functions
	dll_numeric
	dll_commands
	dll_variable
	dll_ctcp
	dll_window

These are not actually directly used by any modules, and hiding them allows us to more easily
change their implementation later.
This commit is contained in:
Kevin Easton
2017-11-06 17:14:12 +11:00
parent a58078de7e
commit 50999b3d5b
4 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog
View File

@@ -1,5 +1,8 @@
[Changes 1.2.2] [Changes 1.2.2]
* Remove dll_functions, dll_numeric, dll_commands, dll_variable, dll_ctcp,
and dll_window variables from the module exports table. (caf)
* Add save_dllvar() function exported to modules, and switch cavlink * Add save_dllvar() function exported to modules, and switch cavlink
and nap plugins to use it. (caf) and nap plugins to use it. (caf)

10
include/module.h
View File

@@ -10,7 +10,7 @@
* if we change the table below, we change this module number to the * if we change the table below, we change this module number to the
* current date (YYYYMMDDxx where xx is a serial number). * current date (YYYYMMDDxx where xx is a serial number).
*/ */
#define MODULE_VERSION 2017110601UL #define MODULE_VERSION 2017110602UL
#include "struct.h" #include "struct.h"
@@ -616,15 +616,7 @@ enum FUNCTION_VALUE
SCREEN_LIST, SCREEN_LIST,
IRCLOG_FP, IRCLOG_FP,
DOING_NOTICE, DOING_NOTICE,
LAST_SENT_MSG_BODY, /* NO LONGER USED */
SENT_NICK, /* NO LONGER USED */
DLL_FUNCTIONS,
DLL_NUMERIC,
DLL_COMMANDS,
DLL_VARIABLE,
DLL_CTCP,
DLL_WINDOW,
WINDOW_DISPLAY, WINDOW_DISPLAY,
STATUS_UPDATE_FLAG, STATUS_UPDATE_FLAG,
TABKEY_ARRAY, TABKEY_ARRAY,

6
include/modval.h
View File

@@ -657,12 +657,6 @@ extern Function_ptr *global;
#define output_screen (*((Screen **)global[OUTPUT_SCREEN])) #define output_screen (*((Screen **)global[OUTPUT_SCREEN]))
#define screen_list (*((Screen **)global[SCREEN_LIST])) #define screen_list (*((Screen **)global[SCREEN_LIST]))
#define irclog_fp (*((FILE **)global[IRCLOG_FP])) #define irclog_fp (*((FILE **)global[IRCLOG_FP]))
#define dll_functions (*((BuiltInDllFunctions **)global[DLL_FUNCTIONS]))
#define dll_numeric (*((NumericFunction **)global[DLL_NUMERIC]))
#define dll_commands (*((IrcCommandDll **)global[DLL_COMMANDS]))
#define dll_variable (*((IrcVariableDll **)global[DLL_VARIABLE]))
#define dll_ctcp (*((CtcpEntryDll **)global[DLL_CTCP]))
#define dll_window (*((WindowDll **)global[DLL_WINDOW]))
#define window_display ((int) *((int *)global[WINDOW_DISPLAY])) #define window_display ((int) *((int *)global[WINDOW_DISPLAY]))
#define status_update_flag ((int) *((int *)global[STATUS_UPDATE_FLAG])) #define status_update_flag ((int) *((int *)global[STATUS_UPDATE_FLAG]))
#define tabkey_array (*((NickTab **)global[TABKEY_ARRAY])) #define tabkey_array (*((NickTab **)global[TABKEY_ARRAY]))

10
source/modules.c
View File

@@ -660,18 +660,8 @@ static int already_done = 0;
global_table[OUTPUT_SCREEN] = (Function_ptr) &output_screen; global_table[OUTPUT_SCREEN] = (Function_ptr) &output_screen;
global_table[SCREEN_LIST] = (Function_ptr) &screen_list; global_table[SCREEN_LIST] = (Function_ptr) &screen_list;
global_table[DOING_NOTICE] = (Function_ptr) &doing_notice; global_table[DOING_NOTICE] = (Function_ptr) &doing_notice;
global_table[SENT_NICK] = 0; /* No longer used */
global_table[LAST_SENT_MSG_BODY] = 0; /* No longer used */
global_table[IRCLOG_FP] = (Function_ptr) &irclog_fp; global_table[IRCLOG_FP] = (Function_ptr) &irclog_fp;
#ifdef WANT_DLL
global_table[DLL_FUNCTIONS] = (Function_ptr) &dll_functions;
global_table[DLL_NUMERIC] = (Function_ptr) &dll_numeric_list;
global_table[DLL_COMMANDS] = (Function_ptr) &dll_commands;
global_table[DLL_WINDOW] = (Function_ptr) &dll_window;
global_table[DLL_VARIABLE] = (Function_ptr) &dll_variable;
global_table[DLL_CTCP] = (Function_ptr) &dll_ctcp;
#endif
global_table[WINDOW_DISPLAY] = (Function_ptr) &window_display; global_table[WINDOW_DISPLAY] = (Function_ptr) &window_display;
global_table[STATUS_UPDATE_FLAG] = (Function_ptr) &status_update_flag; global_table[STATUS_UPDATE_FLAG] = (Function_ptr) &status_update_flag;
global_table[TABKEY_ARRAY] = (Function_ptr) &tabkey_array; global_table[TABKEY_ARRAY] = (Function_ptr) &tabkey_array;