From: Christophe CURIS Date: Sat, 11 May 2013 22:24:54 +0000 (+0200) Subject: WPrefs: Cleaned dangerous function prototype usage X-Git-Tag: wmaker-0.95.5~65 X-Git-Url: https://repo.or.cz/w/wmaker-crm.git/commitdiff_plain/5a65dbeb3dc1fdc25c0db4f4d49da5bbe55134ab WPrefs: Cleaned dangerous function prototype usage - remove extern declaration in source file, use header instead - add inclusion of header defining the functions of the file to get the compiler to cross-check them - marked static the functions that should not be visible ouside their file --- diff --git a/WPrefs.app/Appearance.c b/WPrefs.app/Appearance.c index 9c3039c3..65865e9f 100644 --- a/WPrefs.app/Appearance.c +++ b/WPrefs.app/Appearance.c @@ -2036,7 +2036,7 @@ static void prepareForClose(_Panel * panel) WMSynchronizeUserDefaults(udb); } -Panel *InitAppearance(WMScreen * scr, WMWindow * win) +Panel *InitAppearance(WMScreen *scr, WMWidget *parent) { _Panel *panel; @@ -2046,7 +2046,7 @@ Panel *InitAppearance(WMScreen * scr, WMWindow * win) panel->description = _("Background texture configuration for windows,\n" "menus and icons."); - panel->parent = win; + panel->parent = parent; panel->callbacks.createWidgets = createPanel; panel->callbacks.updateDomain = storeData; diff --git a/WPrefs.app/Focus.c b/WPrefs.app/Focus.c index d664cfa5..9567ddeb 100644 --- a/WPrefs.app/Focus.c +++ b/WPrefs.app/Focus.c @@ -330,7 +330,7 @@ static void createPanel(Panel * p) showData(panel); } -Panel *InitFocus(WMScreen * scr, WMWindow * win) +Panel *InitFocus(WMScreen *scr, WMWidget *parent) { _Panel *panel; @@ -338,7 +338,7 @@ Panel *InitFocus(WMScreen * scr, WMWindow * win) panel->sectionName = _("Window Focus Preferences"); panel->description = _("Keyboard focus switching policy and related options."); - panel->parent = win; + panel->parent = parent; panel->callbacks.createWidgets = createPanel; panel->callbacks.updateDomain = storeData; diff --git a/WPrefs.app/Menu.c b/WPrefs.app/Menu.c index 1f00d536..752bd8fb 100644 --- a/WPrefs.app/Menu.c +++ b/WPrefs.app/Menu.c @@ -179,7 +179,6 @@ static Bool shouldRemoveItem(struct WEditMenuDelegate *delegate, WEditMenu * men static void freeItemData(ItemData * data); -extern char *capture_shortcut(Display *dpy, Bool *capturing, Bool convert_case); static WEditMenuDelegate menuDelegate = { NULL, diff --git a/WPrefs.app/MouseSettings.c b/WPrefs.app/MouseSettings.c index 2c836aef..bebf9f5d 100644 --- a/WPrefs.app/MouseSettings.c +++ b/WPrefs.app/MouseSettings.c @@ -158,7 +158,6 @@ static void doubleClick(WMWidget * w, void *data) { _Panel *panel = (_Panel *) data; int i; - extern _WINGsConfiguration WINGsConfiguration; char buffer[32]; for (i = 0; i < 5; i++) { diff --git a/WPrefs.app/WPrefs.c b/WPrefs.app/WPrefs.c index 3acbd395..6d74409a 100644 --- a/WPrefs.app/WPrefs.c +++ b/WPrefs.app/WPrefs.c @@ -22,40 +22,6 @@ #include "WPrefs.h" #include -extern Panel *InitWindowHandling(WMScreen * scr, WMWidget * parent); - -extern Panel *InitKeyboardSettings(WMScreen * scr, WMWidget * parent); - -extern Panel *InitMouseSettings(WMScreen * scr, WMWidget * parent); - -extern Panel *InitKeyboardShortcuts(WMScreen * scr, WMWidget * parent); - -extern Panel *InitWorkspace(WMScreen * scr, WMWidget * parent); - -extern Panel *InitDocks(WMScreen *scr, WMWidget *parent); - -extern Panel *InitFocus(WMScreen * scr, WMWidget * parent); - -extern Panel *InitPreferences(WMScreen * scr, WMWidget * parent); - -extern Panel *InitFont(WMScreen * scr, WMWidget * parent); -extern Panel *InitFontSimple(WMScreen * scr, WMWidget * parent); - -extern Panel *InitConfigurations(WMScreen * scr, WMWidget * parent); - -extern Panel *InitPaths(WMScreen * scr, WMWidget * parent); - -extern Panel *InitMenu(WMScreen * scr, WMWidget * parent); - -extern Panel *InitExpert(WMScreen * scr, WMWidget * parent); - -extern Panel *InitMenuPreferences(WMScreen * scr, WMWidget * parent); - -extern Panel *InitIcons(WMScreen * scr, WMWidget * parent); - -extern Panel *InitThemes(WMScreen * scr, WMWidget * parent); - -extern Panel *InitAppearance(WMScreen * scr, WMWidget * parent); #define ICON_TITLE_FONT "sans serif:pixelsize=9" #define ICON_TITLE_VFONT "sans serif:pixelsize=9:weight=100" @@ -104,7 +70,7 @@ static void savePanelData(Panel * panel); static void prepareForClose(void); -void quit(WMWidget * w, void *data) +static void quit(WMWidget *w, void *data) { prepareForClose(); @@ -200,7 +166,7 @@ static void prepareForClose(void) } } -void toggleBalloons(WMWidget * w, void *data) +static void toggleBalloons(WMWidget *w, void *data) { WMUserDefaults *udb = WMGetStandardUserDefaults(); Bool flag; diff --git a/WPrefs.app/WPrefs.h b/WPrefs.app/WPrefs.h index c640061d..021bf3b4 100644 --- a/WPrefs.app/WPrefs.h +++ b/WPrefs.app/WPrefs.h @@ -111,6 +111,11 @@ void SetBoolForKey(Bool value, const char *defaultName); void SetSpeedForKey(int speed, const char *defaultName); +/* ---[ KeyboardShortcuts.c ] -------------------------------------------- */ + +char *capture_shortcut(Display *dpy, Bool *capturing, Bool convert_case); + + /* ---[ double.c ] ------------------------------------------------------- */ typedef struct W_DoubleTest DoubleTest; @@ -125,6 +130,28 @@ void AddDeadChildHandler(pid_t pid, void (*handler)(void*), void *data); int ModifierFromKey(Display * dpy, const char *key); +/* ---[ Panel Initializers ]---------------------------------------------- */ + +void Initialize(WMScreen *scr); + +/* in alphabetical order - in case you'd want to add one */ +Panel *InitAppearance(WMScreen *scr, WMWidget *parent); +Panel *InitConfigurations(WMScreen *scr, WMWidget *parent); +Panel *InitDocks(WMScreen *scr, WMWidget *parent); +Panel *InitExpert(WMScreen *scr, WMWidget *parent); +Panel *InitFocus(WMScreen *scr, WMWidget *parent); +Panel *InitFontSimple(WMScreen *scr, WMWidget *parent); +Panel *InitIcons(WMScreen *scr, WMWidget *parent); +Panel *InitKeyboardShortcuts(WMScreen *scr, WMWidget *parent); +Panel *InitMenu(WMScreen *scr, WMWidget *parent); +Panel *InitMenuPreferences(WMScreen *scr, WMWidget *parent); +Panel *InitMouseSettings(WMScreen *scr, WMWidget *parent); +Panel *InitPaths(WMScreen *scr, WMWidget *parent); +Panel *InitPreferences(WMScreen *scr, WMWidget *parent); +Panel *InitWindowHandling(WMScreen *scr, WMWidget *parent); +Panel *InitWorkspace(WMScreen *scr, WMWidget *parent); + + #define FRAME_TOP 105 #define FRAME_LEFT -2 #define FRAME_WIDTH 524 diff --git a/WPrefs.app/double.c b/WPrefs.app/double.c index 715e78c1..56e33f86 100644 --- a/WPrefs.app/double.c +++ b/WPrefs.app/double.c @@ -133,7 +133,6 @@ static void deactivate(void *data) static void handleActionEvents(XEvent * event, void *data) { _DoubleTest *dPtr = (_DoubleTest *) data; - extern _WINGsConfiguration WINGsConfiguration; switch (event->type) { case ButtonPress: diff --git a/WPrefs.app/main.c b/WPrefs.app/main.c index 6e9cd9ed..561113fa 100644 --- a/WPrefs.app/main.c +++ b/WPrefs.app/main.c @@ -29,7 +29,6 @@ char *NOptionValueChanged = "NOptionValueChanged"; -extern void Initialize(WMScreen * scr); #define MAX_DEATHS 64 @@ -42,7 +41,7 @@ struct { static pid_t DeadChildren[MAX_DEATHS]; static int DeadChildrenCount = 0; -void wAbort(Bool foo) +static void wAbort(Bool foo) { exit(1); } diff --git a/WPrefs.app/xmodifier.c b/WPrefs.app/xmodifier.c index c7ac1d53..d0b1a229 100644 --- a/WPrefs.app/xmodifier.c +++ b/WPrefs.app/xmodifier.c @@ -39,6 +39,8 @@ Perpetrator: Sudish Joseph , Sept. 1997. */ #include +#include "WPrefs.h" + /************************************************************************/ /* keymap handling */ /************************************************************************/