From 3b1f6e7c72208658952e71de163b11c8ccb6fd47 Mon Sep 17 00:00:00 2001 From: Kim Woelders Date: Sun, 21 Mar 2004 01:39:40 +0000 Subject: [PATCH] Enable compiling with -Wwrite-strings (trivial fixups). SVN revision: 9414 --- dox/dox.c | 8 +- dox/dox.h | 6 +- dox/file.c | 2 +- dox/text.c | 4 +- dox/ttfont.c | 2 +- eesh/E.h | 8 +- eesh/comms.c | 2 +- eesh/lists.c | 4 +- eesh/main.c | 2 +- src/E.h | 135 +++++++++++++------------ src/actions.c | 249 +++++++++++++++++++++++----------------------- src/alert.c | 19 ++-- src/borders.c | 4 +- src/buttons.c | 4 +- src/comms.c | 15 +-- src/config.c | 25 ++--- src/desktops.c | 4 +- src/dialog.c | 22 ++-- src/ewmh.c | 2 +- src/file.c | 17 ++-- src/fx.c | 3 +- src/globals.c | 2 +- src/iconify.c | 2 +- src/ipc.c | 248 ++++++++++++++++++++++----------------------- src/lists.c | 2 +- src/menus.c | 28 +++--- src/moveresize.c | 4 +- src/pager.c | 2 +- src/session.c | 42 ++++---- src/size.c | 8 +- src/snaps.c | 4 +- src/startup.c | 2 +- src/timers.c | 4 +- src/tooltips.c | 2 +- src/ttfont.c | 16 +-- src/windowmatch.c | 2 +- 36 files changed, 459 insertions(+), 446 deletions(-) diff --git a/dox/dox.c b/dox/dox.c index 1025307d..450a8887 100644 --- a/dox/dox.c +++ b/dox/dox.c @@ -95,7 +95,7 @@ Imlib_Image *im_title; Imlib_Image *im_prev1, *im_prev2; Imlib_Image *im_next1, *im_next2; Imlib_Image *im_exit1, *im_exit2; -char *docdir; +char *docdir = NULL; Window CreateWindow(Window parent, int x, int y, int ww, int hh); int ReadHeader(FILE * f); @@ -222,7 +222,8 @@ main(int argc, char **argv) int i, w, h, t, x, y; int wx, wy; FILE *f; - char *s, *docfile = NULL; + char *s; + const char *docfile; Pixmap draw = 0; Link *l = NULL, *ll = NULL; Imlib_Border ibd; @@ -293,7 +294,6 @@ main(int argc, char **argv) exit(1); } - docdir = "."; docfile = "MAIN"; for (i = 1; i < argc; i++) { @@ -309,6 +309,8 @@ main(int argc, char **argv) else docdir = strdup(argv[i]); } + if (docdir == NULL) + docdir = strdup("."); s = malloc(strlen(docdir) + strlen(docfile) + 2 + 20); sprintf(s, "%s/%s", docdir, docfile); findLocalizedFile(s); diff --git a/dox/dox.h b/dox/dox.h index 2d2097c4..ce6f62d5 100644 --- a/dox/dox.h +++ b/dox/dox.h @@ -279,7 +279,7 @@ typedef struct _link } Link; -void Efont_extents(Efont * f, char *text, +void Efont_extents(Efont * f, const char *text, int *font_ascent_return, int *font_descent_return, int *width_return, int *max_ascent_return, @@ -291,9 +291,9 @@ void EFont_draw_string(Display * disp, Drawable win, GC gc, int x, int y, char *text, Efont * font, Visual * vis, Colormap cm); -char **TextGetLines(char *text, int *count); +char **TextGetLines(const char *text, int *count); void TextStateLoadFont(TextState * ts); -void TextSize(TextState * ts, char *text, +void TextSize(TextState * ts, const char *text, int *width, int *height, int fsize); void TextDraw(TextState * ts, Window win, char *text, int x, int y, int w, int h, int fsize, diff --git a/dox/file.c b/dox/file.c index 4fba08c9..b1501523 100644 --- a/dox/file.c +++ b/dox/file.c @@ -123,7 +123,7 @@ word_mb(char *s, int num, char *wd, int *spaceflag) int wcflg, mbflg; struct char_class { - char *name; + const char *name; wctype_t wt; } *cc, char_class_tbl[] = { diff --git a/dox/text.c b/dox/text.c index a62ff81e..3e205add 100644 --- a/dox/text.c +++ b/dox/text.c @@ -24,7 +24,7 @@ #include "dox.h" char ** -TextGetLines(char *text, int *count) +TextGetLines(const char *text, int *count) { int i, j, k; char **list = NULL; @@ -146,7 +146,7 @@ TextStateLoadFont(TextState * ts) } void -TextSize(TextState * ts, char *text, int *width, int *height, int fsize) +TextSize(TextState * ts, const char *text, int *width, int *height, int fsize) { char **lines; int i, num_lines; diff --git a/dox/ttfont.c b/dox/ttfont.c index 6b12c4fa..03453f0e 100644 --- a/dox/ttfont.c +++ b/dox/ttfont.c @@ -95,7 +95,7 @@ Efont_load(char *file, int size) } void -Efont_extents(Efont * f, char *text, int *font_ascent_return, +Efont_extents(Efont * f, const char *text, int *font_ascent_return, int *font_descent_return, int *width_return, int *max_ascent_return, int *max_descent_return, int *lbearing_return __UNUSED__, int *rbearing_return __UNUSED__) diff --git a/eesh/E.h b/eesh/E.h index 83f4a925..682d9d11 100644 --- a/eesh/E.h +++ b/eesh/E.h @@ -105,8 +105,8 @@ void *Emalloc(int size); void *Erealloc(void *ptr, int size); void Efree(void *ptr); -void *FindItem(char *name, int id, int find_by, int type); -void AddItem(void *item, char *name, int id, int type); +void *FindItem(const char *name, int id, int find_by, int type); +void AddItem(void *item, const char *name, int id, int type); void *RemoveItem(char *name, int id, int find_by, int type); void **ListItemType(int *num, int type); char **ListItems(int *num, int type); @@ -116,7 +116,7 @@ void SetupX(void); void CommsSetup(void); void CommsFindCommsWindow(void); -void CommsSend(Client * c, char *s); +void CommsSend(Client * c, const char *s); char *CommsGet(Client ** c, XEvent * ev); Client *MakeClient(Window win); void ListFreeClient(void *ptr); @@ -219,7 +219,7 @@ extern int debug_level; } #endif -void Alert(char *fmt, ...); +void Alert(const char *fmt, ...); void EDisplayMemUse(void); diff --git a/eesh/comms.c b/eesh/comms.c index 4d42d9e7..3b0db72e 100644 --- a/eesh/comms.c +++ b/eesh/comms.c @@ -84,7 +84,7 @@ CommsFindCommsWindow() } void -CommsSend(Client * c, char *s) +CommsSend(Client * c, const char *s) { char ss[21]; int i, j, k, len; diff --git a/eesh/lists.c b/eesh/lists.c index 00b1f77b..aeb8cc22 100644 --- a/eesh/lists.c +++ b/eesh/lists.c @@ -25,7 +25,7 @@ #include "E.h" void * -FindItem(char *name, int id, int find_by, int type) +FindItem(const char *name, int id, int find_by, int type) { List *ptr; @@ -72,7 +72,7 @@ FindItem(char *name, int id, int find_by, int type) } void -AddItem(void *item, char *name, int id, int type) +AddItem(void *item, const char *name, int id, int type) { List *ptr; diff --git a/eesh/main.c b/eesh/main.c index ad74f7cf..fa249dec 100644 --- a/eesh/main.c +++ b/eesh/main.c @@ -182,7 +182,7 @@ main(int argc, char **argv) } void -Alert(char *fmt, ...) +Alert(const char *fmt, ...) { va_list ap; diff --git a/src/E.h b/src/E.h index 4582528f..b7a366e8 100644 --- a/src/E.h +++ b/src/E.h @@ -1552,7 +1552,7 @@ RectBox; void RefreshScreen(void); void GrabButtonGrabs(EWin * ewin); void UnGrabButtonGrabs(EWin * ewin); -ActionClass *CreateAclass(char *name); +ActionClass *CreateAclass(const char *name); Action *CreateAction(char event, char anymod, int mod, int anybut, int but, char anykey, char *key, char *tooltipstring); @@ -1561,14 +1561,15 @@ void AddToAction(Action * act, int id, void *params); void AddAction(ActionClass * a, Action * act); int EventAclass(XEvent * ev, EWin * ewin, ActionClass * a); -int ActionsCall(unsigned int type, EWin * ewin, void *params); +int ActionsCall(unsigned int type, EWin * ewin, + const void *params); int ActionsSuspend(void); int ActionsResume(void); void ActionsHandleMotion(void); int ActionsEnd(EWin * ewin); -int execApplication(void *params); -int doDragButtonEnd(void *params); +int execApplication(const void *params); +int doDragButtonEnd(const void *params); /* alert.c */ void AlertInit(void); @@ -1577,12 +1578,12 @@ void AlertX(const char *title, const char *ignore, const char *restart, const char *quit, const char *fmt, ...); void InitStringList(void); -void AssignIgnoreFunction(int (*FunctionToAssign) (void *), - void *params); -void AssignRestartFunction(int (*FunctionToAssign) (void *), - void *params); -void AssignExitFunction(int (*FunctionToAssign) (void *), - void *params); +void AssignIgnoreFunction(int (*func) (const void *), + const void *params); +void AssignRestartFunction(int (*func) (const void *), + const void *params); +void AssignExitFunction(int (*func) (const void *), + const void *params); void AssignTitleText(const char *text); void AssignIgnoreText(const char *text); void AssignRestartText(const char *text); @@ -1651,7 +1652,7 @@ void LowerEwin(EWin * ewin); void ShowEwin(EWin * ewin); void HideEwin(EWin * ewin); void FreeBorder(Border * b); -Border *CreateBorder(char *name); +Border *CreateBorder(const char *name); void AddBorderPart(Border * b, ImageClass * iclass, ActionClass * aclass, TextClass * tclass, ECursor * ec, char ontop, int flags, @@ -1679,7 +1680,7 @@ void SlideEwinTo(EWin * ewin, int fx, int fy, int tx, int ty, void SlideEwinsTo(EWin ** ewin, int *fx, int *fy, int *tx, int *ty, int num_wins, int speed); void AddToFamily(Window win); -EWin *AddInternalToFamily(Window win, char *bname, int type, +EWin *AddInternalToFamily(Window win, const char *bname, int type, void *ptr, void (*init) (EWin * ewin, void *ptr)); void CalcEwinSizes(EWin * ewin); @@ -1714,7 +1715,7 @@ int BordersEventMouseOut(XEvent * ev); int BordersEventMouseOut2(XEvent * ev); /* buttons.c */ -Button *ButtonCreate(char *name, ImageClass * iclass, +Button *ButtonCreate(const char *name, ImageClass * iclass, ActionClass * aclass, TextClass * tclass, char *label, char ontop, int flags, int minw, int maxw, int minh, int maxh, int xo, int yo, @@ -1742,7 +1743,7 @@ ActionClass *ButtonGetAClass(Button * b); int ButtonIsFixed(Button * b); int ButtonEmbedWindow(Button * ButtonToUse, Window WindowToEmbed); -void ButtonFindEmptySpotFor(Button * bt, char *listname, +void ButtonFindEmptySpotFor(Button * bt, const char *listname, char dirtomove); int ButtonsEventExpose(XEvent * ev); int ButtonsEventMouseDown(XEvent * ev); @@ -1772,10 +1773,10 @@ void ModifyCMClass(char *name, int rnum, unsigned char *rpx, /* comms.c */ void CommsSetup(void); void CommsFindCommsWindow(void); -void CommsSend(Client * c, char *s); -void CommsSendToMasterWM(char *s); -void CommsBroadcast(char *s); -void CommsBroadcastToSlaveWMs(char *s); +void CommsSend(Client * c, const char *s); +void CommsSendToMasterWM(const char *s); +void CommsBroadcast(const char *s); +void CommsBroadcastToSlaveWMs(const char *s); Client *MakeClient(Window win); void ListFreeClient(void *ptr); void DeleteClient(Client * c); @@ -1811,11 +1812,12 @@ void SlideWindowTo(Window win, int fx, int fy, int tx, int ty, void KeepBGimages(Background * bg, char onoff); void RemoveImagesFromBG(Background * bg); void FreeDesktopBG(Background * bg); -Background *CreateDesktopBG(char *name, XColor * solid, char *bg, - char tile, char keep_aspect, int xjust, - int yjust, int xperc, int yperc, char *top, - char tkeep_aspect, int txjust, int tyjust, - int txperc, int typerc); +Background *CreateDesktopBG(const char *name, XColor * solid, + const char *bg, char tile, char keep_aspect, + int xjust, int yjust, int xperc, int yperc, + const char *top, char tkeep_aspect, + int txjust, int tyjust, int txperc, + int typerc); void RefreshCurrentDesktop(void); void RefreshDesktop(int num); void SetBackgroundTo(Window win, Background * dsk, char setbg); @@ -1842,9 +1844,9 @@ void FloatEwinAboveDesktops(EWin * ewin); void DesktopAccounting(void); /* dialog.c */ -Dialog *DialogCreate(char *name); +Dialog *DialogCreate(const char *name); void DialogDestroy(Dialog * d); -void DialogBindKey(Dialog * d, char *key, +void DialogBindKey(Dialog * d, const char *key, void (*func) (int val, void *data), int val, void *data); void DialogSetText(Dialog * d, const char *text); @@ -1856,7 +1858,7 @@ void DialogRedraw(Dialog * d); void ShowDialog(Dialog * d); void DialogClose(Dialog * d); -void DialogAddButton(Dialog * d, char *text, +void DialogAddButton(Dialog * d, const char *text, void (*func) (int val, void *data), char doclose); DItem *DialogInitItem(Dialog * d); @@ -1874,9 +1876,9 @@ void DialogItemSetAlign(DItem * di, int align_h, int align_v); void DialogItemCallCallback(DItem * di); void DialogDrawItems(Dialog * d, DItem * di, int x, int y, int w, int h); -void DialogItemButtonSetText(DItem * di, char *text); -void DialogItemCheckButtonSetText(DItem * di, char *text); -void DialogItemTextSetText(DItem * di, char *text); +void DialogItemButtonSetText(DItem * di, const char *text); +void DialogItemCheckButtonSetText(DItem * di, const char *text); +void DialogItemTextSetText(DItem * di, const char *text); void DialogItemRadioButtonSetEventFunc(DItem * di, void (*func) (int val, void @@ -1888,11 +1890,11 @@ void DialogItemTableSetOptions(DItem * di, int num_columns, char homogenous_v); void DialogItemSeparatorSetOrientation(DItem * di, char horizontal); -void DialogItemImageSetFile(DItem * di, char *image); +void DialogItemImageSetFile(DItem * di, const char *image); void DialogFreeItem(DItem * di); void DialogItemSetRowSpan(DItem * di, int row_span); void DialogItemSetColSpan(DItem * di, int col_span); -void DialogItemRadioButtonSetText(DItem * di, char *text); +void DialogItemRadioButtonSetText(DItem * di, const char *text); void DialogItemRadioButtonSetFirst(DItem * di, DItem * first); void DialogItemRadioButtonGroupSetValPtr(DItem * di, int *val_ptr); @@ -2040,10 +2042,10 @@ int permissions(const char *s); char *username(int uid); char *homedir(int uid); char *usershell(int uid); -char *atword(char *s, int num); -char *atchar(char *s, char c); +const char *atword(const char *s, int num); +const char *atchar(const char *s, char c); char *getword(char *s, int num); -void word(char *s, int num, char *wd); +void word(const char *s, int num, char *wd); int canread(const char *s); int canwrite(const char *s); int canexec(const char *s); @@ -2051,7 +2053,7 @@ char *fileof(const char *s); char *fullfileof(const char *s); char *pathtoexec(const char *file); char *pathtofile(const char *file); -char *FileExtension(char *file); +const char *FileExtension(const char *file); char *field(char *s, int fieldno); int fillfield(char *s, int fieldno, char *buf); void fword(char *s, int num, char *wd); @@ -2114,7 +2116,7 @@ void FX_Op(const char *name, int fx_op); void FX_DeskChange(void); void FX_Pause(void); char **FX_Active(int *num); -int FX_IsOn(char *effect); +int FX_IsOn(const char *effect); #if ENABLE_GNOME /* gnome.c */ @@ -2264,7 +2266,7 @@ Iconbox *SelectIconboxForEwin(EWin * ewin); void SetupFallbackClasses(void); /* ipc.c */ -int HandleIPC(char *params, Client * c); +int HandleIPC(const char *params, Client * c); void ButtonIPC(int val, void *data); /* lists.c */ @@ -2276,7 +2278,7 @@ void *RemoveItemByPtr(void *ptritem, int type); void **ListItemType(int *num, int type); char **ListItems(int *num, int type); void **ListItemTypeID(int *num, int type, int id); -void **ListItemTypeName(int *num, int type, char *name); +void **ListItemTypeName(int *num, int type, const char *name); void MoveItemToListTop(void *item, int type); void ListChangeItemID(int type, void *ptr, int id); void MoveItemToListBottom(void *item, int type); @@ -2295,24 +2297,25 @@ void MenuShow(Menu * m, char noshow); void MenuRepack(Menu * m); void MenuEmpty(Menu * m); MenuItem *MenuItemCreate(const char *text, ImageClass * iclass, - int action_id, char *action_params, + int action_id, const char *action_params, Menu * child); void MenuAddItem(Menu * menu, MenuItem * item); void MenuAddName(Menu * menu, const char *name); void MenuAddTitle(Menu * menu, const char *title); void MenuAddStyle(Menu * menu, const char *style); void MenuRealize(Menu * m); -Menu *MenuCreateFromDirectory(char *name, MenuStyle * ms, - char *dir); -Menu *MenuCreateFromFlatFile(char *name, MenuStyle * ms, - char *file, Menu * parent); -Menu *MenuCreateFromGnome(char *name, MenuStyle * ms, char *dir); -Menu *MenuCreateFromAllEWins(char *name, MenuStyle * ms); -Menu *MenuCreateFromDesktopEWins(char *name, MenuStyle * ms, +Menu *MenuCreateFromDirectory(const char *name, MenuStyle * ms, + const char *dir); +Menu *MenuCreateFromFlatFile(const char *name, MenuStyle * ms, + const char *file, Menu * parent); +Menu *MenuCreateFromGnome(const char *name, MenuStyle * ms, + const char *dir); +Menu *MenuCreateFromAllEWins(const char *name, MenuStyle * ms); +Menu *MenuCreateFromDesktopEWins(const char *name, MenuStyle * ms, int desk); -Menu *MenuCreateFromDesktops(char *name, MenuStyle * ms); -Menu *MenuCreateFromThemes(char *name, MenuStyle * ms); -Menu *MenuCreateFromBorders(char *name, MenuStyle * ms); +Menu *MenuCreateFromDesktops(const char *name, MenuStyle * ms); +Menu *MenuCreateFromThemes(const char *name, MenuStyle * ms); +Menu *MenuCreateFromBorders(const char *name, MenuStyle * ms); Window MenuWindow(Menu * menu); void MenuShowMasker(Menu * m); void MenuHideMasker(void); @@ -2353,13 +2356,13 @@ int Esetenv(const char *name, const char *value, int overwrite); #endif /* moveresize.c */ -int ActionMoveStart(EWin * ewin, void *params, char constrained, - int nogroup); +int ActionMoveStart(EWin * ewin, const void *params, + char constrained, int nogroup); int ActionMoveEnd(EWin * ewin); int ActionMoveSuspend(void); int ActionMoveResume(void); void ActionMoveHandleMotion(void); -int ActionResizeStart(EWin * ewin, void *params, int hv); +int ActionResizeStart(EWin * ewin, const void *params, int hv); int ActionResizeEnd(EWin * ewin); void ActionResizeHandleMotion(void); @@ -2421,12 +2424,12 @@ int GetPointerScreenGeometry(int *px, int *py, /* session.c */ void SessionInit(void); void SessionSave(int shutdown); -int SessionExit(void *params); +int SessionExit(const void *params); void ProcessICEMSGS(void); int GetSMfd(void); void SessionGetInfo(EWin * ewin, Atom atom_change); -void SetSMID(char *smid); -void SetSMFile(char *path); +void SetSMID(const char *smid); +void SetSMFile(const char *path); void SetSMProgName(const char *name); void SetSMUserThemePath(const char *path); char *GetSMFile(void); @@ -2467,9 +2470,9 @@ Window MakeExtInitWin(void); void SetupUserInitialization(void); /* size.c */ -void MaxSize(EWin * ewin, char *resize_type); -void MaxWidth(EWin * ewin, char *resize_type); -void MaxHeight(EWin * ewin, char *resize_type); +void MaxSize(EWin * ewin, const char *resize_type); +void MaxWidth(EWin * ewin, const char *resize_type); +void MaxHeight(EWin * ewin, const char *resize_type); /* slideouts.c */ void SlideWindowSizeTo(Window win, int fx, int fy, int tx, @@ -2573,15 +2576,15 @@ char *FindTheme(const char *theme); /* timers.c */ double GetTime(void); -void DoIn(char *name, double in_time, +void DoIn(const char *name, double in_time, void (*func) (int val, void *data), int runtime_val, void *runtime_data); Qentry *GetHeadTimerQueue(void); void HandleTimerEvent(void); -void RemoveTimerEvent(char *name); +void RemoveTimerEvent(const char *name); /* tooltips.c */ -ToolTip *CreateToolTip(char *name, ImageClass * ic0, +ToolTip *CreateToolTip(const char *name, ImageClass * ic0, ImageClass * ic1, ImageClass * ic2, ImageClass * ic3, ImageClass * ic4, TextClass * tclass, int dist, @@ -2592,16 +2595,16 @@ void HideToolTip(ToolTip * tt); void FreeToolTip(ToolTip * tt); /* ttfont.c */ -void Efont_extents(Efont * f, char *text, +void Efont_extents(Efont * f, const char *text, int *font_ascent_return, int *font_descent_return, int *width_return, int *max_ascent_return, int *max_descent_return, int *lbearing_return, int *rbearing_return); -Efont *Efont_load(char *file, int size); +Efont *Efont_load(const char *file, int size); void Efont_free(Efont * f); void EFont_draw_string(Display * disp, Drawable win, GC gc, - int x, int y, char *text, Efont * f, + int x, int y, const char *text, Efont * f, Visual * vis, Colormap cm); /* warp.c */ @@ -2610,7 +2613,7 @@ void WarpFocus(int delta); void WarpFocusFinish(void); /* windowmatch.c */ -WindowMatch *CreateWindowMatch(char *name); +WindowMatch *CreateWindowMatch(const char *name); char TestWindowMatch(EWin * ewin, WindowMatch * b); Border *MatchEwinBorder(EWin * ewin, WindowMatch * b); ImageClass *MatchEwinIcon(EWin * ewin, WindowMatch * b); @@ -2765,7 +2768,7 @@ extern int numlock_mask; extern int scrollock_mask; extern int mask_mod_combos[8]; extern Group *current_group; -extern char *dstr; +extern const char *dstr; extern char *e_machine_name; #ifdef HAS_XINERAMA diff --git a/src/actions.c b/src/actions.c index 73353877..f4f4e327 100644 --- a/src/actions.c +++ b/src/actions.c @@ -29,14 +29,14 @@ typedef struct char ok_zoom; char ok_movres; char hide_slideouts; - int (*func) (EWin * ewin, void *params); + int (*func) (EWin * ewin, const void *params); } ActionFunction; static ActionFunction ActionFunctions[ACTION_NUMBEROF]; static char mode_action_destroy = 0; ActionClass * -CreateAclass(char *name) +CreateAclass(const char *name) { ActionClass *a; @@ -348,7 +348,7 @@ AddAction(ActionClass * a, Action * act) } int -ActionsCall(unsigned int id, EWin * ewin, void *params) +ActionsCall(unsigned int id, EWin * ewin, const void *params) { ActionFunction *af; @@ -560,7 +560,7 @@ EventAclass(XEvent * ev, EWin * ewin, ActionClass * a) */ static int -doNothing(EWin * ewin, void *params) +doNothing(EWin * ewin, const void *params) { EDBUG(6, "doNothing"); EDBUG_RETURN(0); @@ -569,7 +569,7 @@ doNothing(EWin * ewin, void *params) } static int -spawnMenu(EWin * ewin, void *params) +spawnMenu(EWin * ewin, const void *params) { char s[1024]; char s2[1024]; @@ -651,7 +651,7 @@ spawnMenu(EWin * ewin, void *params) } static int -hideMenu(EWin * ewin, void *params) +hideMenu(EWin * ewin, const void *params) { EDBUG(6, "hideMenu"); EDBUG_RETURN(0); @@ -660,7 +660,7 @@ hideMenu(EWin * ewin, void *params) } static int -runApp(char *exe, char *params) +runApp(const char *exe, const char *params) { char *sh; char *path; @@ -780,7 +780,7 @@ runApp(char *exe, char *params) } int -execApplication(void *params) +execApplication(const void *params) { #if 0 /* Is there any reason to do this? */ char exe[FILEPATH_LEN_MAX]; @@ -831,7 +831,7 @@ execApplication(void *params) EDBUG_RETURN(0); #else char exe[FILEPATH_LEN_MAX]; - char *s = params; + const char *s = params; sscanf(s, "%4000s", exe); runApp(exe, s); @@ -841,14 +841,14 @@ execApplication(void *params) } static int -doExec(EWin * edummy, void *params) +doExec(EWin * edummy, const void *params) { return execApplication(params); edummy = NULL; } static int -doAlert(EWin * edummy, void *params) +doAlert(EWin * edummy, const void *params) { char *pp; int i; @@ -879,7 +879,7 @@ doAlert(EWin * edummy, void *params) } static int -doExit(EWin * ewin, void *params) +doExit(EWin * ewin, const void *params) { EDBUG(6, "doExit"); @@ -890,43 +890,43 @@ doExit(EWin * ewin, void *params) } static int -doResize(EWin * ewin, void *params) +doResize(EWin * ewin, const void *params) { return ActionResizeStart(ewin, params, MODE_RESIZE); } static int -doResizeH(EWin * ewin, void *params) +doResizeH(EWin * ewin, const void *params) { return ActionResizeStart(ewin, params, MODE_RESIZE_H); } static int -doResizeV(EWin * ewin, void *params) +doResizeV(EWin * ewin, const void *params) { return ActionResizeStart(ewin, params, MODE_RESIZE_V); } static int -doMove(EWin * ewin, void *params) +doMove(EWin * ewin, const void *params) { return ActionMoveStart(ewin, params, 0, 0); } static int -doMoveConstrained(EWin * ewin, void *params) +doMoveConstrained(EWin * ewin, const void *params) { return ActionMoveStart(ewin, params, 1, 0); } static int -doMoveNoGroup(EWin * ewin, void *params) +doMoveNoGroup(EWin * ewin, const void *params) { return ActionMoveStart(ewin, params, 0, 1); } static int -doSwapMove(EWin * ewin, void *params) +doSwapMove(EWin * ewin, const void *params) { Mode.swapmovemode = 1; return ActionMoveStart(ewin, params, 0, 0); @@ -934,7 +934,7 @@ doSwapMove(EWin * ewin, void *params) #if 0 /* Not used */ static int -doMoveConstrainedNoGroup(EWin * ewin, void *params) +doMoveConstrainedNoGroup(EWin * ewin, const void *params) { return ActionMoveStart(ewin, params, 1, 1); } @@ -1097,7 +1097,7 @@ ActionsEnd(EWin * ewin) } static int -DoRaise(EWin * ewin, void *params, int nogroup) +DoRaise(EWin * ewin, const void *params, int nogroup) { EWin **gwins = NULL; int i, num; @@ -1113,7 +1113,7 @@ DoRaise(EWin * ewin, void *params, int nogroup) } static int -DoLower(EWin * ewin, void *params, int nogroup) +DoLower(EWin * ewin, const void *params, int nogroup) { EWin **gwins = NULL; int i, num; @@ -1129,25 +1129,25 @@ DoLower(EWin * ewin, void *params, int nogroup) } static int -doRaise(EWin * ewin, void *params) +doRaise(EWin * ewin, const void *params) { return DoRaise(ewin, params, 0); } static int -doRaiseNoGroup(EWin * ewin, void *params) +doRaiseNoGroup(EWin * ewin, const void *params) { return DoRaise(ewin, params, 1); } static int -doLower(EWin * ewin, void *params) +doLower(EWin * ewin, const void *params) { return DoLower(ewin, params, 0); } static int -doLowerNoGroup(EWin * ewin, void *params) +doLowerNoGroup(EWin * ewin, const void *params) { return DoLower(ewin, params, 1); } @@ -1169,7 +1169,7 @@ FindEwinInList(EWin * ewin, EWin ** gwins, int num) } static int -DoRaiseLower(EWin * ewin, void *params, int nogroup) +DoRaiseLower(EWin * ewin, const void *params, int nogroup) { EWin **gwins, **lst; int gnum, j, raise = 0; @@ -1217,19 +1217,19 @@ DoRaiseLower(EWin * ewin, void *params, int nogroup) } static int -doRaiseLower(EWin * ewin, void *params) +doRaiseLower(EWin * ewin, const void *params) { return DoRaiseLower(ewin, params, 0); } static int -doRaiseLowerNoGroup(EWin * ewin, void *params) +doRaiseLowerNoGroup(EWin * ewin, const void *params) { return DoRaiseLower(ewin, params, 1); } static int -doCleanup(EWin * edummy, void *params) +doCleanup(EWin * edummy, const void *params) { char *type; int method; @@ -1406,7 +1406,7 @@ doCleanup(EWin * edummy, void *params) } static int -doKill(EWin * ewin, void *params) +doKill(EWin * ewin, const void *params) { EDBUG(6, "doKill"); KillEwin(ewin, 0); @@ -1415,7 +1415,7 @@ doKill(EWin * ewin, void *params) } static int -doKillNoGroup(EWin * ewin, void *params) +doKillNoGroup(EWin * ewin, const void *params) { EDBUG(6, "doKillNoGroup"); KillEwin(ewin, 1); @@ -1424,7 +1424,7 @@ doKillNoGroup(EWin * ewin, void *params) } static int -doKillNasty(EWin * ewin, void *params) +doKillNasty(EWin * ewin, const void *params) { EDBUG(6, "doKillNasty"); @@ -1437,7 +1437,7 @@ doKillNasty(EWin * ewin, void *params) /* Desktop actions */ static int -DoGotoDesktop(EWin * edummy, void *params, int num) +DoGotoDesktop(EWin * edummy, const void *params, int num) { int pd; @@ -1457,33 +1457,33 @@ DoGotoDesktop(EWin * edummy, void *params, int num) } static int -doNextDesktop(EWin * edummy, void *params) +doNextDesktop(EWin * edummy, const void *params) { return DoGotoDesktop(edummy, NULL, desks.current + 1); params = NULL; } static int -doPrevDesktop(EWin * edummy, void *params) +doPrevDesktop(EWin * edummy, const void *params) { return DoGotoDesktop(edummy, NULL, desks.current - 1); params = NULL; } static int -doGotoDesktop(EWin * edummy, void *params) +doGotoDesktop(EWin * edummy, const void *params) { return DoGotoDesktop(edummy, params, desks.current); } static int -doInplaceDesktop(EWin * edummy, void *params) +doInplaceDesktop(EWin * edummy, const void *params) { return DoGotoDesktop(edummy, params, desks.current); } static int -doRaiseDesktop(EWin * edummy, void *params) +doRaiseDesktop(EWin * edummy, const void *params) { int d = 0; @@ -1501,7 +1501,7 @@ doRaiseDesktop(EWin * edummy, void *params) } static int -doLowerDesktop(EWin * edummy, void *params) +doLowerDesktop(EWin * edummy, const void *params) { int d = 0; @@ -1519,7 +1519,7 @@ doLowerDesktop(EWin * edummy, void *params) } static int -doDragDesktop(EWin * edummy, void *params) +doDragDesktop(EWin * edummy, const void *params) { int d = 0; @@ -1543,7 +1543,7 @@ doDragDesktop(EWin * edummy, void *params) /* Window ops */ static int -DoStick(EWin * ewin, void *params, int nogroup) +DoStick(EWin * ewin, const void *params, int nogroup) { EWin **gwins = NULL; Group *curr_group = NULL; @@ -1574,19 +1574,19 @@ DoStick(EWin * ewin, void *params, int nogroup) } static int -doStick(EWin * ewin, void *params) +doStick(EWin * ewin, const void *params) { return DoStick(ewin, params, 0); } static int -doStickNoGroup(EWin * ewin, void *params) +doStickNoGroup(EWin * ewin, const void *params) { return DoStick(ewin, params, 1); } static int -doSkipLists(EWin * ewin, void *params) +doSkipLists(EWin * ewin, const void *params) { char skip; @@ -1605,7 +1605,7 @@ doSkipLists(EWin * ewin, void *params) } static int -doSkipTask(EWin * ewin, void *params) +doSkipTask(EWin * ewin, const void *params) { EDBUG(6, "doSkipTask"); @@ -1619,7 +1619,7 @@ doSkipTask(EWin * ewin, void *params) } static int -doSkipFocus(EWin * ewin, void *params) +doSkipFocus(EWin * ewin, const void *params) { EDBUG(6, "doSkipFocus"); @@ -1632,7 +1632,7 @@ doSkipFocus(EWin * ewin, void *params) } static int -doSkipWinList(EWin * ewin, void *params) +doSkipWinList(EWin * ewin, const void *params) { EDBUG(6, "doSkipWinList"); @@ -1645,7 +1645,7 @@ doSkipWinList(EWin * ewin, void *params) } static int -doNeverFocus(EWin * ewin, void *params) +doNeverFocus(EWin * ewin, const void *params) { EDBUG(6, "doSkipWinList"); @@ -1660,7 +1660,7 @@ doNeverFocus(EWin * ewin, void *params) /* Button actions */ static int -doDragButtonStart(EWin * edummy, void *params) +doDragButtonStart(EWin * edummy, const void *params) { Button *b; @@ -1690,7 +1690,7 @@ doDragButtonStart(EWin * edummy, void *params) } int -doDragButtonEnd(void *params) +doDragButtonEnd(const void *params) { Button *b; int d; @@ -1722,7 +1722,7 @@ doDragButtonEnd(void *params) /* Settings */ static int -doFocusModeSet(EWin * edummy, void *params) +doFocusModeSet(EWin * edummy, const void *params) { EDBUG(6, "doFocusModeSet"); if (params) @@ -1750,7 +1750,7 @@ doFocusModeSet(EWin * edummy, void *params) } static int -doMoveModeSet(EWin * edummy, void *params) +doMoveModeSet(EWin * edummy, const void *params) { EDBUG(6, "doMoveModeSet"); if (params) @@ -1773,7 +1773,7 @@ doMoveModeSet(EWin * edummy, void *params) } static int -doResizeModeSet(EWin * edummy, void *params) +doResizeModeSet(EWin * edummy, const void *params) { EDBUG(6, "doResizeModeSet"); if (params) @@ -1794,7 +1794,7 @@ doResizeModeSet(EWin * edummy, void *params) } static int -doSlideModeSet(EWin * edummy, void *params) +doSlideModeSet(EWin * edummy, const void *params) { EDBUG(6, "doSlideModeSet"); if (params) @@ -1813,7 +1813,7 @@ doSlideModeSet(EWin * edummy, void *params) } static int -doCleanupSlideSet(EWin * edummy, void *params) +doCleanupSlideSet(EWin * edummy, const void *params) { EDBUG(6, "doCleanupSlideSet"); if (params) @@ -1833,7 +1833,7 @@ doCleanupSlideSet(EWin * edummy, void *params) } static int -doMapSlideSet(EWin * edummy, void *params) +doMapSlideSet(EWin * edummy, const void *params) { EDBUG(6, "doMapSlideSet"); if (params) @@ -1851,7 +1851,7 @@ doMapSlideSet(EWin * edummy, void *params) } static int -doSoundSet(EWin * edummy, void *params) +doSoundSet(EWin * edummy, const void *params) { char snd; @@ -1879,7 +1879,7 @@ doSoundSet(EWin * edummy, void *params) } static int -doButtonMoveResistSet(EWin * edummy, void *params) +doButtonMoveResistSet(EWin * edummy, const void *params) { EDBUG(6, "doButtonMoveResistSet"); if (params) @@ -1890,7 +1890,7 @@ doButtonMoveResistSet(EWin * edummy, void *params) } static int -doDesktopBgTimeoutSet(EWin * edummy, void *params) +doDesktopBgTimeoutSet(EWin * edummy, const void *params) { EDBUG(6, "doDesktopBgTimeoutSet"); if (params) @@ -1901,7 +1901,7 @@ doDesktopBgTimeoutSet(EWin * edummy, void *params) } static int -doMapSlideSpeedSet(EWin * edummy, void *params) +doMapSlideSpeedSet(EWin * edummy, const void *params) { EDBUG(6, "doMapSlideSpeedSet"); if (params) @@ -1912,7 +1912,7 @@ doMapSlideSpeedSet(EWin * edummy, void *params) } static int -doCleanupSlideSpeedSet(EWin * edummy, void *params) +doCleanupSlideSpeedSet(EWin * edummy, const void *params) { EDBUG(6, "doCleanupSlideSpeedSet"); if (params) @@ -1923,7 +1923,7 @@ doCleanupSlideSpeedSet(EWin * edummy, void *params) } static int -doDragdirSet(EWin * edummy, void *params) +doDragdirSet(EWin * edummy, const void *params) { char pd; Button *b; @@ -1959,7 +1959,7 @@ doDragdirSet(EWin * edummy, void *params) } static int -doDragbarOrderSet(EWin * edummy, void *params) +doDragbarOrderSet(EWin * edummy, const void *params) { char pd; Button *b; @@ -1988,7 +1988,7 @@ doDragbarOrderSet(EWin * edummy, void *params) } static int -doDragbarWidthSet(EWin * edummy, void *params) +doDragbarWidthSet(EWin * edummy, const void *params) { int pd; Button *b; @@ -2011,7 +2011,7 @@ doDragbarWidthSet(EWin * edummy, void *params) } static int -doDragbarLengthSet(EWin * edummy, void *params) +doDragbarLengthSet(EWin * edummy, const void *params) { int pd; Button *b; @@ -2034,7 +2034,7 @@ doDragbarLengthSet(EWin * edummy, void *params) } static int -doDeskSlideSet(EWin * edummy, void *params) +doDeskSlideSet(EWin * edummy, const void *params) { EDBUG(6, "doDeskSlideSet"); if (params) @@ -2052,7 +2052,7 @@ doDeskSlideSet(EWin * edummy, void *params) } static int -doDeskSlideSpeedSet(EWin * edummy, void *params) +doDeskSlideSpeedSet(EWin * edummy, const void *params) { EDBUG(6, "doDeskSlideSpeedSet"); if (params) @@ -2063,7 +2063,7 @@ doDeskSlideSpeedSet(EWin * edummy, void *params) } static int -doHiQualityBgSet(EWin * edummy, void *params) +doHiQualityBgSet(EWin * edummy, const void *params) { EDBUG(6, "doHiQualityBgSet"); if (params) @@ -2081,7 +2081,7 @@ doHiQualityBgSet(EWin * edummy, void *params) } static int -doAutosaveSet(EWin * edummy, void *params) +doAutosaveSet(EWin * edummy, const void *params) { EDBUG(6, "doAutosaveSet"); if (params) @@ -2098,7 +2098,7 @@ doAutosaveSet(EWin * edummy, void *params) } static int -doToolTipSet(EWin * edummy, void *params) +doToolTipSet(EWin * edummy, const void *params) { EDBUG(6, "doToolTipSet"); if (params) @@ -2113,7 +2113,7 @@ doToolTipSet(EWin * edummy, void *params) /* Misc actions */ static int -doPlaySoundClass(EWin * edummy, void *params) +doPlaySoundClass(EWin * edummy, const void *params) { EDBUG(6, "doPlaySoundClass"); @@ -2127,7 +2127,7 @@ doPlaySoundClass(EWin * edummy, void *params) } static int -doDeskray(EWin * edummy, void *params) +doDeskray(EWin * edummy, const void *params) { EDBUG(6, "doDeskray"); if (params) @@ -2161,10 +2161,11 @@ doDeskray(EWin * edummy, void *params) } static int -doHideShowButton(EWin * edummy, void *params) +doHideShowButton(EWin * edummy, const void *params) { Button **lst, *b; - char s[1024], *ss; + char s[1024]; + const char *ss; int num, i; EDBUG(6, "doHideShowButton"); @@ -2253,7 +2254,7 @@ doHideShowButton(EWin * edummy, void *params) } static int -doScrollContainer(EWin * edummy, void *params) +doScrollContainer(EWin * edummy, const void *params) { EDBUG(6, "doScrollContainer"); EDBUG_RETURN(0); @@ -2264,7 +2265,7 @@ doScrollContainer(EWin * edummy, void *params) /* More winops */ static int -DoIconifyWindow(EWin * ewin, void *params, int nogroup) +DoIconifyWindow(EWin * ewin, const void *params, int nogroup) { Group *curr_group = NULL; char iconified; @@ -2315,13 +2316,13 @@ DoIconifyWindow(EWin * ewin, void *params, int nogroup) } static int -doIconifyWindow(EWin * ewin, void *params) +doIconifyWindow(EWin * ewin, const void *params) { return DoIconifyWindow(ewin, params, 0); } static int -doIconifyWindowNoGroup(EWin * ewin, void *params) +doIconifyWindowNoGroup(EWin * ewin, const void *params) { return DoIconifyWindow(ewin, params, 1); } @@ -2329,7 +2330,7 @@ doIconifyWindowNoGroup(EWin * ewin, void *params) /* More misc */ static int -doSlideout(EWin * ewin, void *params) +doSlideout(EWin * ewin, const void *params) { Slideout *s; @@ -2347,7 +2348,7 @@ doSlideout(EWin * ewin, void *params) } static int -doScrollWindows(EWin * edummy, void *params) +doScrollWindows(EWin * edummy, const void *params) { int x, y, num, i; EWin **lst; @@ -2379,7 +2380,7 @@ doScrollWindows(EWin * edummy, void *params) /* More winops */ static int -DoShade(EWin * ewin, void *params, int nogroup) +DoShade(EWin * ewin, const void *params, int nogroup) { EWin **gwins = NULL; Group *curr_group = NULL; @@ -2413,19 +2414,19 @@ DoShade(EWin * ewin, void *params, int nogroup) } static int -doShade(EWin * ewin, void *params) +doShade(EWin * ewin, const void *params) { return DoShade(ewin, params, 0); } static int -doShadeNoGroup(EWin * ewin, void *params) +doShadeNoGroup(EWin * ewin, const void *params) { return DoShade(ewin, params, 1); } static int -doMaxH(EWin * ewin, void *params) +doMaxH(EWin * ewin, const void *params) { EDBUG(6, "doMaxH"); if (ewin->shaded) @@ -2436,7 +2437,7 @@ doMaxH(EWin * ewin, void *params) } static int -doMaxW(EWin * ewin, void *params) +doMaxW(EWin * ewin, const void *params) { EDBUG(6, "doMaxW"); if (ewin->shaded) @@ -2447,7 +2448,7 @@ doMaxW(EWin * ewin, void *params) } static int -doMax(EWin * ewin, void *params) +doMax(EWin * ewin, const void *params) { EDBUG(6, "doMax"); if (ewin->shaded) @@ -2458,7 +2459,7 @@ doMax(EWin * ewin, void *params) } static int -doSendToNextDesk(EWin * ewin, void *params) +doSendToNextDesk(EWin * ewin, const void *params) { EDBUG(6, "doSendToNextDesk"); MoveEwinToDesktop(ewin, ewin->desktop + 1); @@ -2471,7 +2472,7 @@ doSendToNextDesk(EWin * ewin, void *params) } static int -doSendToPrevDesk(EWin * ewin, void *params) +doSendToPrevDesk(EWin * ewin, const void *params) { EDBUG(6, "doSendToPrevDesk"); MoveEwinToDesktop(ewin, ewin->desktop - 1); @@ -2484,7 +2485,7 @@ doSendToPrevDesk(EWin * ewin, void *params) } static int -doSnapshot(EWin * ewin, void *params) +doSnapshot(EWin * ewin, const void *params) { EDBUG(6, "doSnapshot"); @@ -2516,7 +2517,7 @@ doSnapshot(EWin * ewin, void *params) } static int -doToggleFixedPos(EWin * ewin, void *params) +doToggleFixedPos(EWin * ewin, const void *params) { EDBUG(6, "doToggleFixedPos"); @@ -2530,7 +2531,7 @@ doToggleFixedPos(EWin * ewin, void *params) } static int -doSetLayer(EWin * ewin, void *params) +doSetLayer(EWin * ewin, const void *params) { int l; @@ -2558,7 +2559,7 @@ doSetLayer(EWin * ewin, void *params) /* Focus actions */ static int -doFocusNext(EWin * edummy, void *params) +doFocusNext(EWin * edummy, const void *params) { EDBUG(6, "doFocusNext"); if (Conf.warplist.enable && Mode.current_event->type == KeyPress) @@ -2571,7 +2572,7 @@ doFocusNext(EWin * edummy, void *params) } static int -doFocusPrev(EWin * edummy, void *params) +doFocusPrev(EWin * edummy, const void *params) { EDBUG(6, "doFocusPrev"); FocusGetPrevEwin(); @@ -2581,7 +2582,7 @@ doFocusPrev(EWin * edummy, void *params) } static int -doFocusSet(EWin * ewin, void *params) +doFocusSet(EWin * ewin, const void *params) { EDBUG(6, "doFocusSet"); @@ -2598,7 +2599,7 @@ doFocusSet(EWin * ewin, void *params) } static int -doBackgroundSet(EWin * edummy, void *params) +doBackgroundSet(EWin * edummy, const void *params) { int desk; Background *bg; @@ -2644,7 +2645,7 @@ doBackgroundSet(EWin * edummy, void *params) /* Area actions */ static int -doAreaSet(EWin * edummy, void *params) +doAreaSet(EWin * edummy, const void *params) { int a, b; @@ -2659,7 +2660,7 @@ doAreaSet(EWin * edummy, void *params) } static int -doAreaMoveBy(EWin * edummy, void *params) +doAreaMoveBy(EWin * edummy, const void *params) { int a, b; @@ -2675,7 +2676,7 @@ doAreaMoveBy(EWin * edummy, void *params) } static int -doLinearAreaSet(EWin * edummy, void *params) +doLinearAreaSet(EWin * edummy, const void *params) { int da; @@ -2690,7 +2691,7 @@ doLinearAreaSet(EWin * edummy, void *params) } static int -doLinearAreaMoveBy(EWin * edummy, void *params) +doLinearAreaMoveBy(EWin * edummy, const void *params) { int da; @@ -2705,7 +2706,7 @@ doLinearAreaMoveBy(EWin * edummy, void *params) } static int -doWarpPointer(EWin * edummy, void *params) +doWarpPointer(EWin * edummy, const void *params) { int dx, dy; @@ -2722,7 +2723,7 @@ doWarpPointer(EWin * edummy, void *params) } static int -doMoveWinToArea(EWin * ewin, void *params) +doMoveWinToArea(EWin * ewin, const void *params) { int dx, dy; @@ -2737,7 +2738,7 @@ doMoveWinToArea(EWin * ewin, void *params) } static int -doMoveWinByArea(EWin * ewin, void *params) +doMoveWinByArea(EWin * ewin, const void *params) { int dx, dy; @@ -2754,7 +2755,7 @@ doMoveWinByArea(EWin * ewin, void *params) } static int -doMoveWinToLinearArea(EWin * ewin, void *params) +doMoveWinToLinearArea(EWin * ewin, const void *params) { int da; @@ -2770,7 +2771,7 @@ doMoveWinToLinearArea(EWin * ewin, void *params) #if 0 /* Not used */ static int -doMoveWinByLinearArea(EWin * ewin, void *params) +doMoveWinByLinearArea(EWin * ewin, const void *params) { EWin *ewin; int da; @@ -2787,7 +2788,7 @@ doMoveWinByLinearArea(EWin * ewin, void *params) #endif static int -DoSetWinBorder(EWin * ewin, void *params, int nogroup) +DoSetWinBorder(EWin * ewin, const void *params, int nogroup) { EWin **gwins = NULL; int i, num; @@ -2845,19 +2846,19 @@ DoSetWinBorder(EWin * ewin, void *params, int nogroup) } static int -doSetWinBorder(EWin * ewin, void *params) +doSetWinBorder(EWin * ewin, const void *params) { return DoSetWinBorder(ewin, params, 0); } static int -doSetWinBorderNoGroup(EWin * ewin, void *params) +doSetWinBorderNoGroup(EWin * ewin, const void *params) { return DoSetWinBorder(ewin, params, 1); } static int -doAbout(EWin * edummy, void *params) +doAbout(EWin * edummy, const void *params) { Dialog *d; DItem *table, *di; @@ -2913,7 +2914,7 @@ doAbout(EWin * edummy, void *params) } static int -doFX(EWin * edummy, void *params) +doFX(EWin * edummy, const void *params) { EDBUG(6, "doFX"); if (params) @@ -2924,7 +2925,7 @@ doFX(EWin * edummy, void *params) } static int -doSetPagerHiq(EWin * edummy, void *params) +doSetPagerHiq(EWin * edummy, const void *params) { EDBUG(6, "doSetPagerHiq"); if (params) @@ -2940,7 +2941,7 @@ doSetPagerHiq(EWin * edummy, void *params) } static int -doSetPagerSnap(EWin * edummy, void *params) +doSetPagerSnap(EWin * edummy, const void *params) { EDBUG(6, "doSetPagerSnap"); if (params) @@ -2956,7 +2957,7 @@ doSetPagerSnap(EWin * edummy, void *params) } static int -doConfigure(EWin * edummy, void *params) +doConfigure(EWin * edummy, const void *params) { char s[1024]; @@ -3036,15 +3037,15 @@ doConfigure(EWin * edummy, void *params) struct _keyset { - char *sym; + const char *sym; int state; - char *ch; + const char *ch; }; static int -doInsertKeys(EWin * edummy, void *params) +doInsertKeys(EWin * edummy, const void *params) { - const struct _keyset ks[] = { + static const struct _keyset ks[] = { {"a", 0, "a"}, {"b", 0, "b"}, {"c", 0, "c"}, @@ -3191,7 +3192,7 @@ doInsertKeys(EWin * edummy, void *params) } static int -doCreateIconbox(EWin * edummy, void *params) +doCreateIconbox(EWin * edummy, const void *params) { Iconbox *ib, **ibl; int num = 0; @@ -3215,7 +3216,7 @@ doCreateIconbox(EWin * edummy, void *params) } static int -doShowHideGroup(EWin * ewin, void *params) +doShowHideGroup(EWin * ewin, const void *params) { EDBUG(6, "doShowGroup"); ShowHideWinGroups(ewin, NULL, SET_TOGGLE); @@ -3224,7 +3225,7 @@ doShowHideGroup(EWin * ewin, void *params) } static int -doStartGroup(EWin * ewin, void *params) +doStartGroup(EWin * ewin, const void *params) { EDBUG(6, "doStartGroup"); BuildWindowGroup(&ewin, 1); @@ -3234,7 +3235,7 @@ doStartGroup(EWin * ewin, void *params) } static int -doAddToGroup(EWin * ewin, void *params) +doAddToGroup(EWin * ewin, const void *params) { EDBUG(6, "doAddToGroup"); if (!current_group) @@ -3256,7 +3257,7 @@ doAddToGroup(EWin * ewin, void *params) } static int -doRemoveFromGroup(EWin * ewin, void *params) +doRemoveFromGroup(EWin * ewin, const void *params) { EDBUG(6, "doRemoveFromGroup"); ChooseGroupDialog(ewin, @@ -3269,7 +3270,7 @@ doRemoveFromGroup(EWin * ewin, void *params) } static int -doBreakGroup(EWin * ewin, void *params) +doBreakGroup(EWin * ewin, const void *params) { EDBUG(6, "doBreakGroup"); ChooseGroupDialog(ewin, _(" Select the group to break "), @@ -3280,7 +3281,7 @@ doBreakGroup(EWin * ewin, void *params) } static int -doZoom(EWin * ewin, void *params) +doZoom(EWin * ewin, const void *params) { char s[1024]; diff --git a/src/alert.c b/src/alert.c index f0cbcc10..da90ebcd 100644 --- a/src/alert.c +++ b/src/alert.c @@ -26,14 +26,14 @@ static void ShowAlert(char *text); static void AlertHandleClick(int button); -static int (*IgnoreFunction) (void *) = NULL; -static void *IgnoreParams = NULL; +static int (*IgnoreFunction) (const void *) = NULL; +static const void *IgnoreParams = NULL; static char *IgnoreText = NULL; -static int (*RestartFunction) (void *) = NULL; -static void *RestartParams = NULL; +static int (*RestartFunction) (const void *) = NULL; +static const void *RestartParams = NULL; static char *RestartText = NULL; -static int (*ExitFunction) (void *) = NULL; -static void *ExitParams = NULL; +static int (*ExitFunction) (const void *) = NULL; +static const void *ExitParams = NULL; static char *ExitText = NULL; static char *TitleText = NULL; @@ -149,7 +149,7 @@ AssignExitText(const char *text) } void -AssignIgnoreFunction(int (*FunctionToAssign) (void *), void *params) +AssignIgnoreFunction(int (*FunctionToAssign) (const void *), const void *params) { EDBUG(7, "AssignIgnoreFunction"); IgnoreFunction = FunctionToAssign; @@ -158,7 +158,8 @@ AssignIgnoreFunction(int (*FunctionToAssign) (void *), void *params) } void -AssignRestartFunction(int (*FunctionToAssign) (void *), void *params) +AssignRestartFunction(int (*FunctionToAssign) (const void *), + const void *params) { EDBUG(7, "AssignRestartFunction"); RestartFunction = FunctionToAssign; @@ -167,7 +168,7 @@ AssignRestartFunction(int (*FunctionToAssign) (void *), void *params) } void -AssignExitFunction(int (*FunctionToAssign) (void *), void *params) +AssignExitFunction(int (*FunctionToAssign) (const void *), const void *params) { EDBUG(7, "AssignExitFunction"); ExitFunction = FunctionToAssign; diff --git a/src/borders.c b/src/borders.c index 16edd615..13c128ba 100644 --- a/src/borders.c +++ b/src/borders.c @@ -679,7 +679,7 @@ AddToFamily(Window win) } EWin * -AddInternalToFamily(Window win, char *bname, int type, void *ptr, +AddInternalToFamily(Window win, const char *bname, int type, void *ptr, void (*init) (EWin * ewin, void *ptr)) { EWin *ewin; @@ -2072,7 +2072,7 @@ FreeBorder(Border * b) } Border * -CreateBorder(char *name) +CreateBorder(const char *name) { Border *b; diff --git a/src/buttons.c b/src/buttons.c index 2e8b822a..4c01c15a 100644 --- a/src/buttons.c +++ b/src/buttons.c @@ -24,7 +24,7 @@ #include "E.h" Button * -ButtonCreate(char *name, ImageClass * iclass, ActionClass * aclass, +ButtonCreate(const char *name, ImageClass * iclass, ActionClass * aclass, TextClass * tclass, char *label, char ontop, int flags, int minw, int maxw, int minh, int maxh, int xo, int yo, int xa, int xr, int ya, int yr, int xsr, int xsa, int ysr, @@ -484,7 +484,7 @@ ButtonEmbedWindow(Button * ButtonToUse, Window WindowToEmbed) } void -ButtonFindEmptySpotFor(Button * bt, char *listname, char dirtomove) +ButtonFindEmptySpotFor(Button * bt, const char *listname, char dirtomove) { Button **blst; diff --git a/src/comms.c b/src/comms.c index c62b6fa8..ad9ad905 100644 --- a/src/comms.c +++ b/src/comms.c @@ -99,7 +99,7 @@ CommsFindCommsWindow(void) } static void -CommsDoSend(Window win, char *s) +CommsDoSend(Window win, const char *s) { char ss[21]; int i, j, k, len; @@ -135,7 +135,7 @@ CommsDoSend(Window win, char *s) } void -CommsSend(Client * c, char *s) +CommsSend(Client * c, const char *s) { EDBUG(5, "CommsSend"); @@ -152,7 +152,7 @@ CommsSend(Client * c, char *s) * and send the message */ void -CommsSendToMasterWM(char *s) +CommsSendToMasterWM(const char *s) { EDBUG(5, "CommsSendToMasterWM"); @@ -169,7 +169,7 @@ CommsSendToMasterWM(char *s) * and broadcast the message */ void -CommsBroadcastToSlaveWMs(char *s) +CommsBroadcastToSlaveWMs(const char *s) { int screen; @@ -247,7 +247,7 @@ CommsGet(Client ** c, XClientMessageEvent * ev) } void -CommsBroadcast(char *s) +CommsBroadcast(const char *s) { char **l; int num, i; @@ -720,7 +720,8 @@ HandleComms(XClientMessageEvent * ev) ActionClass *ac; Action *a; int i, l; - char buf[FILEPATH_LEN_MAX], *sp, *ss; + char buf[FILEPATH_LEN_MAX]; + const char *sp, *ss; Mode.keybinds_changed = 1; ac = (ActionClass *) RemoveItem("KEYBINDINGS", 0, LIST_FINDBY_NAME, @@ -1546,7 +1547,7 @@ HandleComms(XClientMessageEvent * ev) } else if (!strcmp(w, "call_raw")) { - char *par; + const char *par; int aid; word(s, 2, w); diff --git a/src/config.c b/src/config.c index ab85fa10..776e558f 100644 --- a/src/config.c +++ b/src/config.c @@ -1073,7 +1073,8 @@ Config_Menu(FILE * ConfigFile) char s3[FILEPATH_LEN_MAX]; char s4[FILEPATH_LEN_MAX]; char s5[FILEPATH_LEN_MAX]; - char *txt = NULL, *params = NULL; + char *txt = NULL; + const char *params = NULL; int i1; Menu *m = NULL, *mm = NULL; MenuItem *mi = NULL; @@ -2634,15 +2635,15 @@ Config_ColorModifier(FILE * ConfigFile) char s[FILEPATH_LEN_MAX]; char s2[FILEPATH_LEN_MAX]; int i1; - char *name = 0; - char *params = 0; - char *current_param = 0; - unsigned char *rx = 0; - unsigned char *ry = 0; - unsigned char *gx = 0; - unsigned char *gy = 0; - unsigned char *bx = 0; - unsigned char *by = 0; + char *name = NULL; + const char *params = NULL; + const char *current_param = NULL; + unsigned char *rx = NULL; + unsigned char *ry = NULL; + unsigned char *gx = NULL; + unsigned char *gy = NULL; + unsigned char *bx = NULL; + unsigned char *by = NULL; int i = 0, tx, ty; int rnum = 0, gnum = 0, bnum = 0; ColorModifierClass *cm; @@ -3285,14 +3286,14 @@ Config_WindowMatch(FILE * ConfigFile) static char *cfg_tmpfile = NULL; static FILE * -OpenConfigFileForReading(char *path, char preprocess) +OpenConfigFileForReading(const char *path, char preprocess) { /* This function will open a file at location path for */ /* reading. */ /* All output is passed through epp for preprocessing however. */ FILE *fpin /*, *fpout */ ; char execline[FILEPATH_LEN_MAX]; - char *epp_path = ENLIGHTENMENT_BIN "/epp"; + const char *epp_path = ENLIGHTENMENT_BIN "/epp"; EDBUG(5, "OpenConfigFileForReading"); diff --git a/src/desktops.c b/src/desktops.c index 4125c9ce..47dcd476 100644 --- a/src/desktops.c +++ b/src/desktops.c @@ -386,9 +386,9 @@ FreeDesktopBG(Background * bg) } Background * -CreateDesktopBG(char *name, XColor * solid, char *bg, char tile, +CreateDesktopBG(const char *name, XColor * solid, const char *bg, char tile, char keep_aspect, int xjust, int yjust, int xperc, - int yperc, char *top, char tkeep_aspect, int txjust, + int yperc, const char *top, char tkeep_aspect, int txjust, int tyjust, int txperc, int typerc) { Background *d; diff --git a/src/dialog.c b/src/dialog.c index b24bbe31..a092d7b4 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -282,7 +282,7 @@ DialogRealizeIClassDefault(void) } void -DialogBindKey(Dialog * d, char *key, void (*func) (int val, void *data), +DialogBindKey(Dialog * d, const char *key, void (*func) (int val, void *data), int val, void *data) { d->num_bindings++; @@ -299,7 +299,7 @@ DialogBindKey(Dialog * d, char *key, void (*func) (int val, void *data), } Dialog * -DialogCreate(char *name) +DialogCreate(const char *name) { Dialog *d; @@ -412,8 +412,8 @@ DialogSetExitFunction(Dialog * d, void (*func) (int val, void *data), int val, } void -DialogAddButton(Dialog * d, char *text, void (*func) (int val, void *data), - char doclose) +DialogAddButton(Dialog * d, const char *text, + void (*func) (int val, void *data), char doclose) { DButton *db; int w, h; @@ -612,7 +612,7 @@ ShowDialog(Dialog * d) XSetWMName(disp, d->win, &xtp); xch = XAllocClassHint(); xch->res_name = d->name; - xch->res_class = "Enlightenment_Dialog"; + xch->res_class = (char *)"Enlightenment_Dialog"; XSetClassHint(disp, d->win, xch); XFree(xch); } @@ -980,7 +980,7 @@ DialogItemCallCallback(DItem * di) static void DialogRealizeItem(Dialog * d, DItem * di) { - char *def = NULL; + const char *def = NULL; int iw = 0, ih = 0; if (di->type == DITEM_BUTTON) @@ -1822,7 +1822,7 @@ DialogItemsRealize(Dialog * d) } void -DialogItemButtonSetText(DItem * di, char *text) +DialogItemButtonSetText(DItem * di, const char *text) { if (di->item.button.text) Efree(di->item.button.text); @@ -1830,7 +1830,7 @@ DialogItemButtonSetText(DItem * di, char *text) } void -DialogItemCheckButtonSetText(DItem * di, char *text) +DialogItemCheckButtonSetText(DItem * di, const char *text) { if (di->item.check_button.text) Efree(di->item.check_button.text); @@ -1838,7 +1838,7 @@ DialogItemCheckButtonSetText(DItem * di, char *text) } void -DialogItemTextSetText(DItem * di, char *text) +DialogItemTextSetText(DItem * di, const char *text) { if (di->item.text.text) Efree(di->item.text.text); @@ -1853,7 +1853,7 @@ DialogItemRadioButtonSetEventFunc(DItem * di, } void -DialogItemRadioButtonSetText(DItem * di, char *text) +DialogItemRadioButtonSetText(DItem * di, const char *text) { if (di->item.radio_button.text) Efree(di->item.radio_button.text); @@ -1918,7 +1918,7 @@ DialogItemSeparatorSetOrientation(DItem * di, char horizontal) } void -DialogItemImageSetFile(DItem * di, char *image) +DialogItemImageSetFile(DItem * di, const char *image) { if (di->item.image.image) Efree(di->item.image.image); diff --git a/src/ewmh.c b/src/ewmh.c index 0c388a3a..2726e773 100644 --- a/src/ewmh.c +++ b/src/ewmh.c @@ -808,7 +808,7 @@ EWMH_ProcessClientMessage(XClientMessageEvent * event) else if (atom == _NET_WM_STATE_MAXIMIZED_VERT || atom == _NET_WM_STATE_MAXIMIZED_HORZ) { - void (*func) (EWin *, char *); + void (*func) (EWin *, const char *); int maskbits; if (atom2 == _NET_WM_STATE_MAXIMIZED_VERT || atom2 == _NET_WM_STATE_MAXIMIZED_HORZ) /* (ok - ok) */ diff --git a/src/file.c b/src/file.c index 9e29deee..26e038f7 100644 --- a/src/file.c +++ b/src/file.c @@ -27,8 +27,8 @@ #include #include -char * -FileExtension(char *file) +const char * +FileExtension(const char *file) { char *p; @@ -465,8 +465,8 @@ usershell(int uid) EDBUG_RETURN(Estrdup("/bin/sh")); } -char * -atword(char *s, int num) +const char * +atword(const char *s, int num) { int cnt, i; @@ -492,8 +492,8 @@ atword(char *s, int num) EDBUG_RETURN(NULL); } -char * -atchar(char *s, char c) +const char * +atchar(const char *s, char c) { int i; @@ -581,10 +581,11 @@ getword(char *s, int num) } void -word(char *s, int num, char *wd) +word(const char *s, int num, char *wd) { int cnt, i; - char *start, *finish, *ss, *w; + char *w; + const char *start, *finish, *ss; EDBUG(9, "word"); if (!s) diff --git a/src/fx.c b/src/fx.c index 0d7039b5..305d8e26 100644 --- a/src/fx.c +++ b/src/fx.c @@ -216,7 +216,7 @@ FX_Active(int *num) } int -FX_IsOn(char *effect) +FX_IsOn(const char *effect) { unsigned int i; @@ -228,7 +228,6 @@ FX_IsOn(char *effect) } } return 0; - } /****************************** RIPPLES *************************************/ diff --git a/src/globals.c b/src/globals.c index 9201548c..cc15c82c 100644 --- a/src/globals.c +++ b/src/globals.c @@ -64,7 +64,7 @@ int numlock_mask = 0; int scrollock_mask = 0; int mask_mod_combos[8]; Group *current_group; -char *dstr = NULL; +const char *dstr = NULL; char *e_machine_name = NULL; #ifdef DEBUG diff --git a/src/iconify.c b/src/iconify.c index e566dfea..eefc4e55 100644 --- a/src/iconify.c +++ b/src/iconify.c @@ -588,7 +588,7 @@ IconboxShow(Iconbox * ib) XSetWMName(disp, ib->win, &xtp); xch = XAllocClassHint(); xch->res_name = ib->name; - xch->res_class = "Enlightenment_IconBox"; + xch->res_class = (char *)"Enlightenment_IconBox"; XSetClassHint(disp, ib->win, xch); XFree(xch); MatchToSnapInfoIconbox(ib); diff --git a/src/ipc.c b/src/ipc.c index 279a2128..62a079df 100644 --- a/src/ipc.c +++ b/src/ipc.c @@ -26,11 +26,11 @@ typedef struct _IPCstruct { - void (*func) (char *params, Client * c); - char *commandname; - char *nick; - char *help_text; - char *extended_help_text; + void (*func) (const char *params, Client * c); + const char *commandname; + const char *nick; + const char *help_text; + const char *extended_help_text; } IPCStruct; @@ -43,68 +43,68 @@ IPCStruct; * --Mandrake */ -static void IPC_Help(char *params, Client * c); -static void IPC_Version(char *params, Client * c); -static void IPC_Copyright(char *params, Client * c); -static void IPC_AutoSave(char *params, Client * c); -static void IPC_DefaultTheme(char *params, Client * c); -static void IPC_Restart(char *params, Client * c); -static void IPC_RestartWM(char *params, Client * c); -static void IPC_RestartTheme(char *params, Client * c); -static void IPC_Exit(char *params, Client * c); -static void IPC_ForceSave(char *params, Client * c); -static void IPC_SMFile(char *params, Client * c); -static void IPC_ListThemes(char *params, Client * c); -static void IPC_GotoDesktop(char *params, Client * c); -static void IPC_ShowIcons(char *params, Client * c); -static void IPC_FocusMode(char *params, Client * c); -static void IPC_AdvancedFocus(char *params, Client * c); -static void IPC_NumDesks(char *params, Client * c); -static void IPC_NumAreas(char *params, Client * c); -static void IPC_WinOps(char *params, Client * c); -static void IPC_WinList(char *params, Client * c); -static void IPC_GotoArea(char *params, Client * c); -static void IPC_ButtonShow(char *params, Client * c); -static void IPC_FX(char *params, Client * c); -static void IPC_MoveMode(char *params, Client * c); -static void IPC_ResizeMode(char *params, Client * c); -static void IPC_GeomInfoMode(char *params, Client * c); -static void IPC_Pager(char *params, Client * c); -static void IPC_InternalList(char *params, Client * c); -static void IPC_SetFocus(char *params, Client * c); -static void IPC_DialogOK(char *params, Client * c); -static void IPC_SoundClass(char *params, Client * c); -static void IPC_ImageClass(char *params, Client * c); -static void IPC_TextClass(char *params, Client * c); -static void IPC_ActionClass(char *params, Client * c); -static void IPC_ColorModifierClass(char *params, Client * c); -static void IPC_Border(char *params, Client * c); -static void IPC_Button(char *params, Client * c); -static void IPC_Background(char *params, Client * c); -static void IPC_Cursor(char *params, Client * c); -static void IPC_PlaySoundClass(char *params, Client * c); -static void IPC_ListClassMembers(char *params, Client * c); -static void IPC_GeneralInfo(char *params, Client * c); -static void IPC_DockConfig(char *params, Client * c); -static void IPC_MemDebug(char *params, Client * c); -static void IPC_Remember(char *params, Client * c); -static void IPC_CurrentTheme(char *params, Client * c); -static void IPC_Nop(char *params, Client * c); -static void IPC_Xinerama(char *params, Client * c); -static void IPC_ConfigPanel(char *params, Client * c); -static void IPC_RememberList(char *params, Client * c); +static void IPC_Help(const char *params, Client * c); +static void IPC_Version(const char *params, Client * c); +static void IPC_Copyright(const char *params, Client * c); +static void IPC_AutoSave(const char *params, Client * c); +static void IPC_DefaultTheme(const char *params, Client * c); +static void IPC_Restart(const char *params, Client * c); +static void IPC_RestartWM(const char *params, Client * c); +static void IPC_RestartTheme(const char *params, Client * c); +static void IPC_Exit(const char *params, Client * c); +static void IPC_ForceSave(const char *params, Client * c); +static void IPC_SMFile(const char *params, Client * c); +static void IPC_ListThemes(const char *params, Client * c); +static void IPC_GotoDesktop(const char *params, Client * c); +static void IPC_ShowIcons(const char *params, Client * c); +static void IPC_FocusMode(const char *params, Client * c); +static void IPC_AdvancedFocus(const char *params, Client * c); +static void IPC_NumDesks(const char *params, Client * c); +static void IPC_NumAreas(const char *params, Client * c); +static void IPC_WinOps(const char *params, Client * c); +static void IPC_WinList(const char *params, Client * c); +static void IPC_GotoArea(const char *params, Client * c); +static void IPC_ButtonShow(const char *params, Client * c); +static void IPC_FX(const char *params, Client * c); +static void IPC_MoveMode(const char *params, Client * c); +static void IPC_ResizeMode(const char *params, Client * c); +static void IPC_GeomInfoMode(const char *params, Client * c); +static void IPC_Pager(const char *params, Client * c); +static void IPC_InternalList(const char *params, Client * c); +static void IPC_SetFocus(const char *params, Client * c); +static void IPC_DialogOK(const char *params, Client * c); +static void IPC_SoundClass(const char *params, Client * c); +static void IPC_ImageClass(const char *params, Client * c); +static void IPC_TextClass(const char *params, Client * c); +static void IPC_ActionClass(const char *params, Client * c); +static void IPC_ColorModifierClass(const char *params, Client * c); +static void IPC_Border(const char *params, Client * c); +static void IPC_Button(const char *params, Client * c); +static void IPC_Background(const char *params, Client * c); +static void IPC_Cursor(const char *params, Client * c); +static void IPC_PlaySoundClass(const char *params, Client * c); +static void IPC_ListClassMembers(const char *params, Client * c); +static void IPC_GeneralInfo(const char *params, Client * c); +static void IPC_DockConfig(const char *params, Client * c); +static void IPC_MemDebug(const char *params, Client * c); +static void IPC_Remember(const char *params, Client * c); +static void IPC_CurrentTheme(const char *params, Client * c); +static void IPC_Nop(const char *params, Client * c); +static void IPC_Xinerama(const char *params, Client * c); +static void IPC_ConfigPanel(const char *params, Client * c); +static void IPC_RememberList(const char *params, Client * c); /* Changes By Asmodean_ / #E@Efnet * * IPC_ReloadMenus(...) / reload_menus - Reloads menus from menus.cfg */ -static void IPC_ReloadMenus(char *params, Client * c); +static void IPC_ReloadMenus(const char *params, Client * c); -static void IPC_GroupInfo(char *params, Client * c); -static void IPC_GroupOps(char *params, Client * c); -static void IPC_Group(char *params, Client * c); -static void IPC_Hints(char *params, Client * c); -static void IPC_Debug(char *params, Client * c); +static void IPC_GroupInfo(const char *params, Client * c); +static void IPC_GroupOps(const char *params, Client * c); +static void IPC_Group(const char *params, Client * c); +static void IPC_Hints(const char *params, Client * c); +static void IPC_Debug(const char *params, Client * c); /* the IPC Array */ @@ -606,12 +606,12 @@ SetEwinBoolean(char *buf, int len, const char *txt, char *item, */ static void -IPC_ConfigPanel(char *params, Client * c) +IPC_ConfigPanel(const char *params, Client * c) { int i = 0; char param[256], buf[FILEPATH_LEN_MAX], buf2[FILEPATH_LEN_MAX]; - static char *cfg_panels[] = { + static const char *cfg_panels[] = { /* I just hardcoded this list form actions.c:doConfigure() -- perhaps * this should be tad more dynamic?? - pabs */ "pager", "pager settings dialog", @@ -663,7 +663,7 @@ IPC_ConfigPanel(char *params, Client * c) } static void -IPC_Xinerama(char *params, Client * c) +IPC_Xinerama(const char *params, Client * c) { params = NULL; #ifdef HAS_XINERAMA @@ -700,14 +700,14 @@ IPC_Xinerama(char *params, Client * c) } static void -IPC_Nop(char *params, Client * c) +IPC_Nop(const char *params, Client * c) { CommsSend(c, "nop"); params = NULL; } static void -IPC_Remember(char *params, Client * c) +IPC_Remember(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; char param[FILEPATH_LEN_MAX]; @@ -773,7 +773,7 @@ IPC_Remember(char *params, Client * c) } static void -IPC_DockConfig(char *params, Client * c) +IPC_DockConfig(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; @@ -921,7 +921,7 @@ IPC_DockConfig(char *params, Client * c) } static void -IPC_GeneralInfo(char *params, Client * c) +IPC_GeneralInfo(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; @@ -948,7 +948,7 @@ IPC_GeneralInfo(char *params, Client * c) } static void -IPC_Button(char *params, Client * c) +IPC_Button(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; @@ -1014,7 +1014,7 @@ IPC_Button(char *params, Client * c) } static void -IPC_Background(char *params, Client * c) +IPC_Background(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; char name[FILEPATH_LEN_MAX]; @@ -1229,7 +1229,7 @@ IPC_Background(char *params, Client * c) } static void -IPC_Border(char *params, Client * c) +IPC_Border(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; @@ -1294,7 +1294,7 @@ IPC_Border(char *params, Client * c) } static void -IPC_Cursor(char *params, Client * c) +IPC_Cursor(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; @@ -1359,7 +1359,7 @@ IPC_Cursor(char *params, Client * c) } static void -IPC_TextClass(char *params, Client * c) +IPC_TextClass(const char *params, Client * c) { char pq; char buf[FILEPATH_LEN_MAX]; @@ -1405,7 +1405,7 @@ IPC_TextClass(char *params, Client * c) { int state; int x, y; - char *txt; + const char *txt; Window win; word(params, 3, param3); @@ -1442,7 +1442,7 @@ IPC_TextClass(char *params, Client * c) if (t) { int w, h; - char *txt; + const char *txt; txt = atword(params, 3); if (txt) @@ -1500,7 +1500,7 @@ IPC_TextClass(char *params, Client * c) } static void -IPC_ColorModifierClass(char *params, Client * c) +IPC_ColorModifierClass(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; @@ -1568,7 +1568,7 @@ IPC_ColorModifierClass(char *params, Client * c) } static void -IPC_ActionClass(char *params, Client * c) +IPC_ActionClass(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; @@ -1634,7 +1634,7 @@ IPC_ActionClass(char *params, Client * c) } static void -IPC_ImageClass(char *params, Client * c) +IPC_ImageClass(const char *params, Client * c) { char pq; char buf[FILEPATH_LEN_MAX]; @@ -1743,7 +1743,8 @@ IPC_ImageClass(char *params, Client * c) if (iclass) { Window win; - char *winptr, *hptr, state[20]; + char state[20]; + const char *winptr, *hptr; int st, w = -1, h = -1; winptr = atword(params, 3); @@ -1779,7 +1780,8 @@ IPC_ImageClass(char *params, Client * c) if (iclass) { Window win; - char *winptr, *hptr, state[20]; + char state[20]; + const char *winptr, *hptr; int st, w = -1, h = -1; winptr = atword(params, 3); @@ -1858,7 +1860,7 @@ IPC_ImageClass(char *params, Client * c) } static void -IPC_SoundClass(char *params, Client * c) +IPC_SoundClass(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; @@ -1916,7 +1918,7 @@ IPC_SoundClass(char *params, Client * c) } static void -IPC_PlaySoundClass(char *params, Client * c) +IPC_PlaySoundClass(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; @@ -1937,7 +1939,7 @@ IPC_PlaySoundClass(char *params, Client * c) } static void -IPC_ListClassMembers(char *params, Client * c) +IPC_ListClassMembers(const char *params, Client * c) { char *buf = NULL; char buf2[FILEPATH_LEN_MAX]; @@ -2128,7 +2130,7 @@ IPC_ListClassMembers(char *params, Client * c) } static void -IPC_DialogOK(char *params, Client * c) +IPC_DialogOK(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; @@ -2144,7 +2146,7 @@ IPC_DialogOK(char *params, Client * c) } static void -IPC_SetFocus(char *params, Client * c) +IPC_SetFocus(const char *params, Client * c) { EWin *ewin; char buf[FILEPATH_LEN_MAX]; @@ -2186,7 +2188,7 @@ IPC_SetFocus(char *params, Client * c) } static void -IPC_AdvancedFocus(char *params, Client * c) +IPC_AdvancedFocus(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; @@ -2572,7 +2574,7 @@ IPC_AdvancedFocus(char *params, Client * c) } static void -IPC_InternalList(char *params, Client * c) +IPC_InternalList(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; char buf2[FILEPATH_LEN_MAX]; @@ -2650,7 +2652,7 @@ IPC_InternalList(char *params, Client * c) } static void -IPC_Pager(char *params, Client * c) +IPC_Pager(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; char param1[FILEPATH_LEN_MAX]; @@ -2878,7 +2880,7 @@ IPC_Pager(char *params, Client * c) } static void -IPC_MoveMode(char *params, Client * c) +IPC_MoveMode(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; @@ -2945,7 +2947,7 @@ IPC_MoveMode(char *params, Client * c) } static void -IPC_ResizeMode(char *params, Client * c) +IPC_ResizeMode(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; @@ -3006,7 +3008,7 @@ IPC_ResizeMode(char *params, Client * c) } static void -IPC_GeomInfoMode(char *params, Client * c) +IPC_GeomInfoMode(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; @@ -3055,7 +3057,7 @@ IPC_GeomInfoMode(char *params, Client * c) } static void -IPC_FX(char *params, Client * c) +IPC_FX(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; @@ -3455,7 +3457,7 @@ IPC_FX(char *params, Client * c) } static void -IPC_ButtonShow(char *params, Client * c) +IPC_ButtonShow(const char *params, Client * c) { ActionsCall(ACTION_HIDESHOW_BUTTON, NULL, params); return; @@ -3463,7 +3465,7 @@ IPC_ButtonShow(char *params, Client * c) } static void -IPC_WinList(char *params, Client * c) +IPC_WinList(const char *params, Client * c) { char *ret = NULL; char buf[FILEPATH_LEN_MAX]; @@ -3519,7 +3521,7 @@ IPC_WinList(char *params, Client * c) } static void -IPC_GotoArea(char *params, Client * c) +IPC_GotoArea(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; char param1[FILEPATH_LEN_MAX]; @@ -3593,7 +3595,7 @@ IPC_GotoArea(char *params, Client * c) } static void -IPC_WinOps(char *params, Client * c) +IPC_WinOps(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; EWin *ewin; @@ -3978,7 +3980,7 @@ IPC_WinOps(char *params, Client * c) } static void -IPC_NumAreas(char *params, Client * c) +IPC_NumAreas(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; @@ -4011,7 +4013,7 @@ IPC_NumAreas(char *params, Client * c) } static void -IPC_NumDesks(char *params, Client * c) +IPC_NumDesks(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; @@ -4037,7 +4039,7 @@ IPC_NumDesks(char *params, Client * c) } static void -IPC_FocusMode(char *params, Client * c) +IPC_FocusMode(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; @@ -4104,7 +4106,7 @@ IPC_FocusMode(char *params, Client * c) } static void -IPC_ShowIcons(char *params, Client * c) +IPC_ShowIcons(const char *params, Client * c) { /* Doesn't look like this function is doing anything, but it used to * if I recall correctly --Mandrake @@ -4115,7 +4117,7 @@ IPC_ShowIcons(char *params, Client * c) } static void -IPC_GotoDesktop(char *params, Client * c) +IPC_GotoDesktop(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; @@ -4149,7 +4151,7 @@ IPC_GotoDesktop(char *params, Client * c) } static void -IPC_ListThemes(char *params, Client * c) +IPC_ListThemes(const char *params, Client * c) { char **list, *buf = NULL; int i, num; @@ -4186,7 +4188,7 @@ IPC_ListThemes(char *params, Client * c) } static void -IPC_SMFile(char *params, Client * c) +IPC_SMFile(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; @@ -4213,7 +4215,7 @@ IPC_SMFile(char *params, Client * c) } static void -IPC_ForceSave(char *params, Client * c) +IPC_ForceSave(const char *params, Client * c) { c = NULL; params = NULL; @@ -4228,7 +4230,7 @@ IPC_ForceSave(char *params, Client * c) } static void -IPC_Restart(char *params, Client * c) +IPC_Restart(const char *params, Client * c) { c = NULL; params = NULL; @@ -4238,7 +4240,7 @@ IPC_Restart(char *params, Client * c) } static void -IPC_RestartWM(char *params, Client * c) +IPC_RestartWM(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; @@ -4256,7 +4258,7 @@ IPC_RestartWM(char *params, Client * c) } static void -IPC_RestartTheme(char *params, Client * c) +IPC_RestartTheme(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; @@ -4274,7 +4276,7 @@ IPC_RestartTheme(char *params, Client * c) } static void -IPC_Exit(char *params, Client * c) +IPC_Exit(const char *params, Client * c) { c = NULL; @@ -4285,7 +4287,7 @@ IPC_Exit(char *params, Client * c) } static void -IPC_DefaultTheme(char *params, Client * c) +IPC_DefaultTheme(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; @@ -4321,7 +4323,7 @@ IPC_DefaultTheme(char *params, Client * c) } static void -IPC_CurrentTheme(char *params, Client * c) +IPC_CurrentTheme(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; @@ -4336,7 +4338,7 @@ IPC_CurrentTheme(char *params, Client * c) } static void -IPC_AutoSave(char *params, Client * c) +IPC_AutoSave(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; @@ -4377,7 +4379,7 @@ ipccmp(void *p1, void *p2) } static void -IPC_Help(char *params, Client * c) +IPC_Help(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; char buf2[FILEPATH_LEN_MAX]; @@ -4471,7 +4473,7 @@ IPC_Help(char *params, Client * c) } static void -IPC_Copyright(char *params, Client * c) +IPC_Copyright(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; @@ -4523,7 +4525,7 @@ IPC_Copyright(char *params, Client * c) } static void -IPC_Version(char *params, Client * c) +IPC_Version(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; @@ -4547,7 +4549,7 @@ IPC_Version(char *params, Client * c) */ int -HandleIPC(char *params, Client * c) +HandleIPC(const char *params, Client * c) { int i; int numIPC; @@ -4595,7 +4597,7 @@ ButtonIPC(int val, void *data) */ static void -IPC_ReloadMenus(char *params, Client * c) +IPC_ReloadMenus(const char *params, Client * c) { /* * Do nothing here but call doExit, following the pattern @@ -4616,7 +4618,7 @@ IPC_ReloadMenus(char *params, Client * c) } static void -IPC_GroupInfo(char *params, Client * c) +IPC_GroupInfo(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; char buf2[FILEPATH_LEN_MAX]; @@ -4694,7 +4696,7 @@ IPC_GroupInfo(char *params, Client * c) } static void -IPC_GroupOps(char *params, Client * c) +IPC_GroupOps(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; Group *group = current_group; @@ -4803,7 +4805,7 @@ IPC_GroupOps(char *params, Client * c) } static void -IPC_Group(char *params, Client * c) +IPC_Group(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; @@ -4945,7 +4947,7 @@ IPC_Group(char *params, Client * c) } static void -IPC_MemDebug(char *params, Client * c) +IPC_MemDebug(const char *params, Client * c) { EDisplayMemUse(); @@ -4954,7 +4956,7 @@ IPC_MemDebug(char *params, Client * c) } static void -IPC_RememberList(char *params, Client * c) +IPC_RememberList(const char *params, Client * c) { Snapshot **lst; int i, j, num, f; @@ -5064,7 +5066,7 @@ IPC_RememberList(char *params, Client * c) } static void -IPC_Hints(char *params, Client * c) +IPC_Hints(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; char param1[FILEPATH_LEN_MAX]; @@ -5092,7 +5094,7 @@ IPC_Hints(char *params, Client * c) } static void -IPC_Debug(char *params, Client * c) +IPC_Debug(const char *params, Client * c) { char buf[FILEPATH_LEN_MAX]; char param1[FILEPATH_LEN_MAX]; diff --git a/src/lists.c b/src/lists.c index 76062395..55fd4d74 100644 --- a/src/lists.c +++ b/src/lists.c @@ -470,7 +470,7 @@ ListItemTypeID(int *num, int type, int id) } void ** -ListItemTypeName(int *num, int type, char *name) +ListItemTypeName(int *num, int type, const char *name) { List *ptr; int i, len; diff --git a/src/menus.c b/src/menus.c index e22c6ed7..e178995a 100644 --- a/src/menus.c +++ b/src/menus.c @@ -394,7 +394,7 @@ MenuStyleCreate(void) MenuItem * MenuItemCreate(const char *text, ImageClass * iclass, int action_id, - char *action_params, Menu * child) + const char *action_params, Menu * child) { MenuItem *mi; @@ -968,12 +968,13 @@ MenuDrawItem(Menu * m, MenuItem * mi, char shape) } Menu * -MenuCreateFromDirectory(char *name, MenuStyle * ms, char *dir) +MenuCreateFromDirectory(const char *name, MenuStyle * ms, const char *dir) { Progressbar *p = NULL; Menu *m, *mm; int i, num; - char **list, s[4096], ss[4096], *ext, cs[4096]; + char **list, s[4096], ss[4096], cs[4096]; + const char *ext; MenuItem *mi; struct stat st; const char *chmap = @@ -1372,7 +1373,8 @@ MenuCreateFromDirectory(char *name, MenuStyle * ms, char *dir) } Menu * -MenuCreateFromFlatFile(char *name, MenuStyle * ms, char *file, Menu * parent) +MenuCreateFromFlatFile(const char *name, MenuStyle * ms, const char *file, + Menu * parent) { Menu *m; char s[4096], *ff = NULL; @@ -1567,7 +1569,7 @@ FileMenuUpdate(int val, void *data) } Menu * -MenuCreateFromGnome(char *name, MenuStyle * ms, char *dir) +MenuCreateFromGnome(const char *name, MenuStyle * ms, const char *dir) { Menu *m, *mm; int i, num; @@ -1685,7 +1687,7 @@ MenuCreateFromGnome(char *name, MenuStyle * ms, char *dir) } Menu * -MenuCreateFromThemes(char *name, MenuStyle * ms) +MenuCreateFromThemes(const char *name, MenuStyle * ms) { Menu *m; char **lst; @@ -1726,7 +1728,7 @@ BorderNameCompare(void *b1, void *b2) } Menu * -MenuCreateFromBorders(char *name, MenuStyle * ms) +MenuCreateFromBorders(const char *name, MenuStyle * ms) { Menu *m; Border **lst; @@ -1757,7 +1759,7 @@ MenuCreateFromBorders(char *name, MenuStyle * ms) } Menu * -MenuCreateFromAllEWins(char *name, MenuStyle * ms) +MenuCreateFromAllEWins(const char *name, MenuStyle * ms) { Menu *m; EWin **lst; @@ -1828,7 +1830,7 @@ MenuCreateFromDesktopEWins(char *name, MenuStyle * ms, int desk) #endif Menu * -MenuCreateFromDesktops(char *name, MenuStyle * ms) +MenuCreateFromDesktops(const char *name, MenuStyle * ms) { Menu *m, *mm; EWin **lst; @@ -1896,7 +1898,7 @@ MenuCreateMoveToDesktop(char *name, MenuStyle * ms) #endif static Menu * -MenuCreateFromGroups(char *name, MenuStyle * ms) +MenuCreateFromGroups(const char *name, MenuStyle * ms) { Menu *m, *mm; Group **lst; @@ -2080,7 +2082,7 @@ MenusInit(void) static Menu * RefreshInternalMenu(Menu * m, MenuStyle * ms, - Menu * (mcf) (char *xxx, MenuStyle * ms)) + Menu * (mcf) (const char *xxx, MenuStyle * ms)) { char was = 0; int lx = 0, ly = 0; @@ -2124,8 +2126,8 @@ RefreshInternalMenu(Menu * m, MenuStyle * ms, } static void -ShowInternalMenu(Menu ** pm, MenuStyle ** pms, char *style, - Menu * (mcf) (char *name, MenuStyle * ms)) +ShowInternalMenu(Menu ** pm, MenuStyle ** pms, const char *style, + Menu * (mcf) (const char *name, MenuStyle * ms)) { Menu *m = *pm; MenuStyle *ms = *pms; diff --git a/src/moveresize.c b/src/moveresize.c index 69912956..76854ad5 100644 --- a/src/moveresize.c +++ b/src/moveresize.c @@ -30,7 +30,7 @@ static int start_move_y = 0; static int real_move_mode = 0; int -ActionMoveStart(EWin * ewin, void *params, char constrained, int nogroup) +ActionMoveStart(EWin * ewin, const void *params, char constrained, int nogroup) { EWin **gwins; int i, num; @@ -254,7 +254,7 @@ ActionMoveResume(void) } int -ActionResizeStart(EWin * ewin, void *params, int hv) +ActionResizeStart(EWin * ewin, const void *params, int hv) { int x, y, w, h; diff --git a/src/pager.c b/src/pager.c index a15934a3..18e60c2d 100644 --- a/src/pager.c +++ b/src/pager.c @@ -323,7 +323,7 @@ PagerShow(Pager * p) Esnprintf(s, sizeof(s), "%i", p->desktop); xch = XAllocClassHint(); xch->res_name = s; - xch->res_class = "Enlightenment_Pager"; + xch->res_class = (char *)"Enlightenment_Pager"; XSetClassHint(disp, p->win, xch); XFree(xch); pq = queue_up; diff --git a/src/session.c b/src/session.c index 7460232f..be4d4908 100644 --- a/src/session.c +++ b/src/session.c @@ -181,7 +181,7 @@ SetSMUserThemePath(const char *path) static int stale_sm_file = 0; void -SetSMFile(char *path) +SetSMFile(const char *path) { if (sm_file) Efree(sm_file); @@ -481,15 +481,15 @@ set_save_props(SmcConn smc_conn, int master_flag) { char *user = NULL; char *program = NULL; - char *pristr = "_GSM_Priority"; - char *smid = "-smid"; - char *single = "-single"; - char *smfile = "-smfile"; - char *econfdir = "-econfdir"; + const char *pristr = "_GSM_Priority"; + const char *smid = "-smid"; + const char *single = "-single"; + const char *smfile = "-smfile"; + const char *econfdir = "-econfdir"; char *e_conf_dir; - char *ecachedir = "-ecachedir"; + const char *ecachedir = "-ecachedir"; char *e_cache_dir; - char *extinitwin = "-ext_init_win"; + const char *extinitwin = "-ext_init_win"; char buf[512]; char priority = 10; char style; @@ -604,31 +604,31 @@ set_save_props(SmcConn smc_conn, int master_flag) if (single_screen_mode) { restartVal[n].length = strlen(single); - restartVal[n++].value = single; + restartVal[n++].value = (char *)single; } if (restarting) { Esnprintf(buf, sizeof(buf), "%li", init_win_ext); restartVal[n].length = strlen(extinitwin); - restartVal[n++].value = extinitwin; + restartVal[n++].value = (char *)extinitwin; restartVal[n].length = strlen(buf); restartVal[n++].value = buf; } restartVal[n].length = strlen(smfile); - restartVal[n++].value = smfile; + restartVal[n++].value = (char *)smfile; restartVal[n].length = strlen(sm_file); restartVal[n++].value = sm_file; restartVal[n].length = strlen(smid); - restartVal[n++].value = smid; + restartVal[n++].value = (char *)smid; restartVal[n].length = strlen(sm_client_id); restartVal[n++].value = sm_client_id; restartVal[n].length = strlen(econfdir); - restartVal[n++].value = econfdir; + restartVal[n++].value = (char *)econfdir; restartVal[n].length = strlen(e_conf_dir); restartVal[n++].value = e_conf_dir; restartVal[n].length = strlen(ecachedir); - restartVal[n++].value = ecachedir; + restartVal[n++].value = (char *)ecachedir; restartVal[n].length = strlen(e_cache_dir); restartVal[n++].value = e_cache_dir; @@ -822,8 +822,8 @@ SessionInit(void) styleVal.length = 1; styleVal.value = style; - styleProp.name = SmRestartStyleHint; - styleProp.type = SmCARD8; + styleProp.name = (char *)SmRestartStyleHint; + styleProp.type = (char *)SmCARD8; styleProp.num_vals = 1; styleProp.vals = &styleVal; @@ -910,14 +910,14 @@ SessionGetInfo(EWin * ewin, Atom atom_change) } void -SetSMID(char *smid) +SetSMID(const char *smid) { #ifdef HAVE_X11_SM_SMLIB_H sm_client_id = smid; #endif /* HAVE_X11_SM_SMLIB_H */ } -static void doSMExit(void *params); +static void doSMExit(const void *params); static void LogoutCB(int val, void *data) { @@ -971,7 +971,7 @@ CB_SettingsEscape(int val, void *data) * so the our clients remain frozen while we are down. */ static void -doSMExit(void *params) +doSMExit(const void *params) { char s[1024]; char master_flag, do_master_kill; @@ -1122,7 +1122,7 @@ doSMExit(void *params) /* This is the original code from actions.c(doExit). */ static void -doSMExit(void *params) +doSMExit(const void *params) { char s[1024]; char *real_exec; @@ -1236,7 +1236,7 @@ doSMExit(void *params) #endif /* HAVE_X11_SM_SMLIB_H */ int -SessionExit(void *param) +SessionExit(const void *param) { doSMExit(param); return 0; diff --git a/src/size.c b/src/size.c index 28dbca20..777624df 100644 --- a/src/size.c +++ b/src/size.c @@ -32,7 +32,7 @@ #define MAX_XINERAMA 3 /* Fill Xinerama screen */ static void -MaxSizeHV(EWin * ewin, char *resize_type, int direction) +MaxSizeHV(EWin * ewin, const char *resize_type, int direction) { int x, y, w, h, x1, x2, y1, y2, type; EWin **lst, *pe; @@ -171,19 +171,19 @@ MaxSizeHV(EWin * ewin, char *resize_type, int direction) } void -MaxWidth(EWin * ewin, char *resize_type) +MaxWidth(EWin * ewin, const char *resize_type) { MaxSizeHV(ewin, resize_type, MAX_HOR); } void -MaxHeight(EWin * ewin, char *resize_type) +MaxHeight(EWin * ewin, const char *resize_type) { MaxSizeHV(ewin, resize_type, MAX_VER); } void -MaxSize(EWin * ewin, char *resize_type) +MaxSize(EWin * ewin, const char *resize_type) { MaxSizeHV(ewin, resize_type, MAX_HOR | MAX_VER); } diff --git a/src/snaps.c b/src/snaps.c index 42ca3308..e75ac7a4 100644 --- a/src/snaps.c +++ b/src/snaps.c @@ -22,7 +22,7 @@ */ #include "E.h" -static Snapshot *NewSnapshot(char *name); +static Snapshot *NewSnapshot(const char *name); /* Format the window identifier string */ static int @@ -104,7 +104,7 @@ GetSnapshot(EWin * ewin) /* create a new snapshot */ static Snapshot * -NewSnapshot(char *name) +NewSnapshot(const char *name) { Snapshot *sn; diff --git a/src/startup.c b/src/startup.c index 9078aaec..79bf47ce 100644 --- a/src/startup.c +++ b/src/startup.c @@ -32,7 +32,7 @@ AddEToFile(char *file) char *s1, *s2; char hase = 0; char foundwm = 0; - char *wms[] = { + const char *wms[] = { "wmaker", "afterstep", "fvwm", "fvwm2", "twm", "mwm", "vtwm", "ctwm", "gwm", "mlvwm", "kwm", "olwm", "wm2", "wmx", "olvwm", "9wm", "blackbox", "awm", diff --git a/src/timers.c b/src/timers.c index e19c3b57..5eca196c 100644 --- a/src/timers.c +++ b/src/timers.c @@ -35,7 +35,7 @@ GetTime(void) static Qentry *q_first = NULL; void -DoIn(char *name, double in_time, void (*func) (int val, void *data), +DoIn(const char *name, double in_time, void (*func) (int val, void *data), int runtime_val, void *runtime_data) { Qentry *qe, *ptr, *pptr; @@ -141,7 +141,7 @@ HandleTimerEvent(void) } void -RemoveTimerEvent(char *name) +RemoveTimerEvent(const char *name) { Qentry *qe, *ptr, *pptr; diff --git a/src/tooltips.c b/src/tooltips.c index 5e12ee4b..881503c0 100644 --- a/src/tooltips.c +++ b/src/tooltips.c @@ -23,7 +23,7 @@ #include "E.h" ToolTip * -CreateToolTip(char *name, ImageClass * ic0, ImageClass * ic1, +CreateToolTip(const char *name, ImageClass * ic0, ImageClass * ic1, ImageClass * ic2, ImageClass * ic3, ImageClass * ic4, TextClass * tclass, int dist, ImageClass * tooltippic) { diff --git a/src/ttfont.c b/src/ttfont.c index ec21d540..be12c5e0 100644 --- a/src/ttfont.c +++ b/src/ttfont.c @@ -44,8 +44,8 @@ ImlibSetFgColorFromGC(Display * dpy, GC gc, Colormap cm) } void -EFont_draw_string(Display * dpy, Drawable win, GC gc, int x, int y, char *text, - Efont * f, Visual * vis, Colormap cm) +EFont_draw_string(Display * dpy, Drawable win, GC gc, int x, int y, + const char *text, Efont * f, Visual * vis, Colormap cm) { Imlib_Image im; int w, h, ascent, descent; @@ -79,7 +79,7 @@ Efont_free(Efont * f) } Efont * -Efont_load(char *file, int size) +Efont_load(const char *file, int size) { char s[4096]; Efont *f; @@ -97,7 +97,7 @@ Efont_load(char *file, int size) } void -Efont_extents(Efont * f, char *text, int *font_ascent_return, +Efont_extents(Efont * f, const char *text, int *font_ascent_return, int *font_descent_return, int *width_return, int *max_ascent_return, int *max_descent_return, int *lbearing_return, int *rbearing_return) @@ -745,8 +745,8 @@ handle_x_error(Display * d, XErrorEvent * ev) } void -EFont_draw_string(Display * disp, Drawable win, GC gc, int x, int y, char *text, - Efont * f, Visual * vis, Colormap cm) +EFont_draw_string(Display * disp, Drawable win, GC gc, int x, int y, + const char *text, Efont * f, Visual * vis, Colormap cm) { XImage *xim; XShmSegmentInfo shminfo; @@ -1029,7 +1029,7 @@ Efont_free(Efont * f) } Efont * -Efont_load(char *file, int size) +Efont_load(const char *file, int size) { TT_Error error; TT_Glyph_Metrics metrics; @@ -1143,7 +1143,7 @@ Efont_load(char *file, int size) } void -Efont_extents(Efont * f, char *text, int *font_ascent_return, +Efont_extents(Efont * f, const char *text, int *font_ascent_return, int *font_descent_return, int *width_return, int *max_ascent_return, int *max_descent_return, int *lbearing_return, int *rbearing_return) diff --git a/src/windowmatch.c b/src/windowmatch.c index 3a42ed81..00a55330 100644 --- a/src/windowmatch.c +++ b/src/windowmatch.c @@ -23,7 +23,7 @@ #include "E.h" WindowMatch * -CreateWindowMatch(char *name) +CreateWindowMatch(const char *name) { WindowMatch *b;