Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
actions.c comms.c draw.c icccm.c iconify.c pager.c settings.c
setup.c
Log Message:
Enable compiling with -Wshadow (code fixups).
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/actions.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -3 -r1.147 -r1.148
--- actions.c 20 Mar 2004 15:49:04 -0000 1.147
+++ actions.c 20 Mar 2004 15:58:44 -0000 1.148
@@ -390,7 +390,7 @@
}
static int
-handleAction(EWin * ewin, ActionType * Action)
+handleAction(EWin * ewin, ActionType * action)
{
/* This function will handle any type of action that is passed into
* it. ALL internal events should be passed through this function.
@@ -400,7 +400,7 @@
int error;
EDBUG(5, "handleAction");
- error = ActionsCall(Action->Type, ewin, Action->params);
+ error = ActionsCall(action->Type, ewin, action->params);
/* Did we just hose ourselves? if so, we'd best not stick around here */
if (mode_action_destroy)
@@ -410,8 +410,8 @@
* we're sure we didn't already die) perform it
*/
if (!error)
- if (Action->Next)
- error = handleAction(ewin, Action->Next);
+ if (action->Next)
+ error = handleAction(ewin, action->Next);
EDBUG_RETURN(error);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/comms.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- comms.c 20 Mar 2004 15:49:05 -0000 1.53
+++ comms.c 20 Mar 2004 15:58:44 -0000 1.54
@@ -1470,11 +1470,11 @@
}
if (dragbar_change)
{
- Button *b;
+ Button *btn;
- while ((b = RemoveItem("_DESKTOP_DRAG_CONTROL", 0,
- LIST_FINDBY_NAME, LIST_TYPE_BUTTON)))
- ButtonDestroy(b);
+ while ((btn = RemoveItem("_DESKTOP_DRAG_CONTROL", 0,
+ LIST_FINDBY_NAME, LIST_TYPE_BUTTON)))
+ ButtonDestroy(btn);
InitDesktopControls();
ShowDesktopControls();
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/draw.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- draw.c 20 Mar 2004 15:49:05 -0000 1.42
+++ draw.c 20 Mar 2004 15:58:44 -0000 1.43
@@ -1620,8 +1620,8 @@
if (firstlast == 0)
{
- XGCValues gcv;
- GC gc;
+ XGCValues gcv2;
+ GC gc2;
if (ewin_pi)
EDestroyPixImg(ewin_pi);
@@ -1647,10 +1647,10 @@
}
EFillPixmap(root.win, root_pi->pmap, x1, y1, ewin->w,
ewin->h);
- gc = XCreateGC(disp, root_pi->pmap, 0, &gcv);
- XCopyArea(disp, root_pi->pmap, ewin_pi->pmap, gc, x1, y1,
+ gc2 = XCreateGC(disp, root_pi->pmap, 0, &gcv2);
+ XCopyArea(disp, root_pi->pmap, ewin_pi->pmap, gc2, x1, y1,
ewin->w, ewin->h, 0, 0);
- XFreeGC(disp, gc);
+ XFreeGC(disp, gc2);
EBlendPixImg(ewin, root_pi, ewin_pi, draw_pi, x, y, ewin->w,
ewin->h);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/icccm.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- icccm.c 20 Mar 2004 15:49:05 -0000 1.54
+++ icccm.c 20 Mar 2004 15:58:44 -0000 1.55
@@ -167,21 +167,21 @@
if (ewin->internal)
{
- XEvent ev;
+ XEvent xev;
if (ewin->menu)
MenuHide(ewin->menu);
if (ewin->pager)
{
HideEwin(ewin);
- ev.xunmap.window = PagerGetWin(ewin->pager);
- HandleUnmap(&ev);
+ xev.xunmap.window = PagerGetWin(ewin->pager);
+ HandleUnmap(&xev);
}
if (ewin->ibox)
{
HideEwin(ewin);
- ev.xunmap.window = IconboxGetWin(ewin->ibox);
- HandleUnmap(&ev);
+ xev.xunmap.window = IconboxGetWin(ewin->ibox);
+ HandleUnmap(&xev);
}
if (ewin->dialog)
DialogClose(ewin->dialog);
@@ -770,7 +770,7 @@
else if (XGetCommand(disp, ewin->client.group, &cargv, &cargc))
{
EWin **lst;
- int i, lnum, ok = 1;
+ int lnum, ok = 1;
lst = (EWin **) ListItemType(&lnum, LIST_TYPE_EWIN);
if (lst)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iconify.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -3 -r1.94 -r1.95
--- iconify.c 20 Mar 2004 15:49:05 -0000 1.94
+++ iconify.c 20 Mar 2004 15:58:46 -0000 1.95
@@ -24,6 +24,9 @@
#include "E.h"
#include <math.h>
+/* Silly hack to avoid name clash warning when using -Wshadow */
+#define y1 y1_
+
static void IconboxRedraw(Iconbox * ib);
#define IB_ANIM_TIME 0.25
@@ -2493,7 +2496,7 @@
{
EWin *ewin;
EWin **gwins;
- int j, num;
+ int j, numg;
char iconified;
ib[i]->icon_clicked = 0;
@@ -2508,12 +2511,12 @@
HideToolTip(tt);
gwins =
ListWinGroupMembersForEwin(ewin, ACTION_ICONIFY,
- Mode.nogroup, &num);
+ Mode.nogroup, &numg);
iconified = ewin->iconified;
if (gwins)
{
- for (j = 0; j < num; j++)
+ for (j = 0; j < numg; j++)
{
if ((gwins[j]->iconified) && (iconified))
DeIconifyEwin(gwins[j]);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -3 -r1.76 -r1.77
--- pager.c 20 Mar 2004 15:49:05 -0000 1.76
+++ pager.c 20 Mar 2004 15:58:46 -0000 1.77
@@ -308,7 +308,7 @@
{
EWin *ewin = NULL;
XClassHint *xch;
- char s[64];
+ char s[4096];
char pq;
if (!Conf.pagers.enable)
@@ -333,7 +333,6 @@
"PAGER", EWIN_TYPE_PAGER, p, PagerEwinInit);
if (ewin)
{
- char s[4096];
int ax, ay, w, h;
Snapshot *sn;
double aspect;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/settings.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -3 -r1.101 -r1.102
--- settings.c 20 Mar 2004 15:49:05 -0000 1.101
+++ settings.c 20 Mar 2004 15:58:46 -0000 1.102
@@ -3260,7 +3260,7 @@
DItem *table, *di, *table2, *area, *slider, *slider2, *label;
DItem *w1, *w2, *w3, *w4, *w5, *w6;
int num;
- char s[256];
+ char s[1024];
if ((d = FindItem("CONFIGURE_BG", 0, LIST_FINDBY_NAME, LIST_TYPE_DIALOG)))
{
@@ -3272,8 +3272,6 @@
if ((!bg) || ((bg) && (!strcmp(bg->name, "NONE"))))
{
- char s[1024];
-
Esnprintf(s, sizeof(s), "__NEWBG_%i\n", (unsigned)time(NULL));
bg = CreateDesktopBG(s, NULL, NULL, 1, 1, 0, 0, 0, 0, NULL, 1, 512, 512,
0, 0);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/setup.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -3 -r1.118 -r1.119
--- setup.c 20 Mar 2004 15:49:05 -0000 1.118
+++ setup.c 20 Mar 2004 15:58:46 -0000 1.119
@@ -565,7 +565,7 @@
Window win;
XGCValues gcv;
GC gc;
- Pixmap pmap;
+ Pixmap pmap, mask;
Atom a;
CARD32 val;
int i;
@@ -674,15 +674,12 @@
{
Window w2, ww;
char *f, s[1024];
- Pixmap pmap, mask;
Imlib_Image *im;
struct timeval tv;
int dd, x, y;
unsigned int mm;
Cursor cs = 0;
XColor cl;
- GC gc;
- XGCValues gcv;
w2 = XCreateWindow(d2, win, 0, 0, 32, 32, 0, root.depth, InputOutput,
root.vis,
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
