Compiz Core

Merge lp:~vanvugt/compiz-core/fix-921451 into lp:compiz-core/0.9.5

  1. fix-921451
  2. Merge into 0.9.5
Proposed by Daniel van Vugt
Status: Merged
Approved by: Sam Spilsbury
Approved revision: 2962
Merged at revision: 2964
Proposed branch: lp:~vanvugt/compiz-core/fix-921451
Merge into: lp:compiz-core/0.9.5
Diff against target: 249 lines (+30/-22)
4 files modified
plugins/place/src/place.cpp (+3/-1)
plugins/resize/src/resize.cpp (+4/-2)
plugins/switcher/src/switcher.cpp (+3/-1)
src/window.cpp (+20/-18)
To merge this branch: bzr merge lp:~vanvugt/compiz-core/fix-921451
Reviewer Review Type Date Requested Status
Alan Griffiths Approve
Review via email: mp+90058@code.launchpad.net

Description of the change

Fix uninitialized variable warnings in valgrind (LP: #921451)

To post a comment you must log in.
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

I don't like defining the same macro in four files - but there's no obvious better place for it.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/place/src/place.cpp'
2--- plugins/place/src/place.cpp 2012-01-21 17:16:07 +0000
3+++ plugins/place/src/place.cpp 2012-01-25 09:24:25 +0000
4@@ -24,6 +24,8 @@
5
6 COMPIZ_PLUGIN_20090315 (place, PlacePluginVTable)
7
8+#define XWINDOWCHANGES_INIT {0, 0, 0, 0, 0, None, 0}
9+
10 PlaceScreen::PlaceScreen (CompScreen *screen) :
11 PluginClassHandler<PlaceScreen, CompScreen> (screen),
12 mPrevSize (screen->width (), screen->height ()),
13@@ -112,7 +114,7 @@
14 CompRect workArea = screen->getWorkareaForOutput (
15 screen->outputDeviceForGeometry (og));
16
17- XWindowChanges xwc;
18+ XWindowChanges xwc = XWINDOWCHANGES_INIT;
19 unsigned int mask = og.changeMask (ng);
20
21 xwc.x = ng.x ();
22
23=== modified file 'plugins/resize/src/resize.cpp'
24--- plugins/resize/src/resize.cpp 2012-01-18 16:26:45 +0000
25+++ plugins/resize/src/resize.cpp 2012-01-25 09:24:25 +0000
26@@ -36,6 +36,8 @@
27
28 COMPIZ_PLUGIN_20090315 (resize, ResizePluginVTable)
29
30+#define XWINDOWCHANGES_INIT {0, 0, 0, 0, 0, None, 0}
31+
32 void
33 ResizeScreen::getPaintRectangle (BoxPtr pBox)
34 {
35@@ -571,7 +573,7 @@
36 if (rs->w)
37 {
38 CompWindow *w = rs->w;
39- XWindowChanges xwc;
40+ XWindowChanges xwc = XWINDOWCHANGES_INIT;
41 unsigned int mask = 0;
42
43 if (rs->mode == ResizeOptions::ModeNormal)
44@@ -671,7 +673,7 @@
45 if (w->serverGeometry ().width () != geometry.width ||
46 w->serverGeometry ().height () != geometry.height)
47 {
48- XWindowChanges xwc;
49+ XWindowChanges xwc = XWINDOWCHANGES_INIT;
50
51 xwc.x = geometry.x;
52 xwc.y = geometry.y;
53
54=== modified file 'plugins/switcher/src/switcher.cpp'
55--- plugins/switcher/src/switcher.cpp 2011-03-11 18:13:44 +0000
56+++ plugins/switcher/src/switcher.cpp 2012-01-25 09:24:25 +0000
57@@ -27,6 +27,8 @@
58
59 COMPIZ_PLUGIN_20090315 (switcher, SwitchPluginVTable)
60
61+#define XWINDOWCHANGES_INIT {0, 0, 0, 0, 0, None, 0}
62+
63 static float _boxVertices[] =
64 {
65 -(WIDTH >> 1), 0,
66@@ -77,7 +79,7 @@
67 {
68 CompWindow *w = screen->findWindow (popupWindow);
69
70- XWindowChanges xwc;
71+ XWindowChanges xwc = XWINDOWCHANGES_INIT;
72 unsigned int valueMask = 0;
73
74 valueMask |= (CWX | CWY | CWWidth | CWHeight);
75
76=== modified file 'src/window.cpp'
77--- src/window.cpp 2012-01-21 18:31:07 +0000
78+++ src/window.cpp 2012-01-25 09:24:25 +0000
79@@ -45,6 +45,8 @@
80 #include "privatescreen.h"
81 #include "privatestackdebugger.h"
82
83+#define XWINDOWCHANGES_INIT {0, 0, 0, 0, 0, None, 0}
84+
85 PluginClassStorage::Indices windowPluginClassIndices (0);
86
87 unsigned int
88@@ -790,7 +792,7 @@
89 void
90 PrivateWindow::updateFrameWindow ()
91 {
92- XWindowChanges xwc;
93+ XWindowChanges xwc = XWINDOWCHANGES_INIT;
94 unsigned int valueMask = CWX | CWY | CWWidth | CWHeight;
95
96 if (!serverFrame)
97@@ -1679,7 +1681,7 @@
98
99 if (priv->unmanaging)
100 {
101- XWindowChanges xwc;
102+ XWindowChanges xwc = XWINDOWCHANGES_INIT;
103 unsigned int xwcm;
104 int gravity = priv->sizeHints.win_gravity;
105
106@@ -2196,7 +2198,7 @@
107 }
108 else
109 {
110- XWindowChanges xwc;
111+ XWindowChanges xwc = XWINDOWCHANGES_INIT;
112 unsigned int valueMask = CWX | CWY;
113 compLogMessage ("core", CompLogLevelDebug, "pending configure notifies on 0x%x, "\
114 "moving window asyncrhonously!", (unsigned int) priv->serverId);
115@@ -2399,7 +2401,7 @@
116 if (!compiz::X11::PendingEvent::match (event))
117 return false;
118
119- XWindowChanges xwc;
120+ XWindowChanges xwc = XWINDOWCHANGES_INIT;
121
122 xwc.x = ce->x;
123 xwc.y = ce->y;
124@@ -2479,7 +2481,7 @@
125 gettimeofday (&priv->lastConfigureRequest, NULL);
126
127 unsigned int valueMask = CWX | CWY;
128- XWindowChanges xwc;
129+ XWindowChanges xwc = XWINDOWCHANGES_INIT;
130
131 if (priv->pendingPositionUpdates && !priv->pendingConfigures.pending ())
132 {
133@@ -2679,7 +2681,7 @@
134 if (screen->vp () != vp)
135 {
136 unsigned int valueMask = CWX | CWY;
137- XWindowChanges xwc;
138+ XWindowChanges xwc = XWINDOWCHANGES_INIT;
139
140 xwc.x = serverGeometry ().x () + (screen->vp ().x () - vp.x ()) * screen->width ();
141 xwc.y = serverGeometry ().y () + (screen->vp ().y () - vp.y ()) * screen->height ();
142@@ -4252,7 +4254,7 @@
143 void
144 PrivateWindow::updateSize ()
145 {
146- XWindowChanges xwc;
147+ XWindowChanges xwc = XWINDOWCHANGES_INIT;
148 int mask;
149
150 if (window->overrideRedirect () || !managed)
151@@ -4282,7 +4284,7 @@
152 {
153 if (!sibling && id)
154 {
155- XWindowChanges lxwc;
156+ XWindowChanges lxwc = XWINDOWCHANGES_INIT;
157 unsigned int valueMask = CWStackMode;
158
159 lxwc.stack_mode = Below;
160@@ -4343,7 +4345,7 @@
161 void
162 CompWindow::raise ()
163 {
164- XWindowChanges xwc;
165+ XWindowChanges xwc = XWINDOWCHANGES_INIT;
166 int mask;
167 bool aboveFs = false;
168
169@@ -4406,7 +4408,7 @@
170 void
171 CompWindow::lower ()
172 {
173- XWindowChanges xwc;
174+ XWindowChanges xwc = XWINDOWCHANGES_INIT;
175 int mask;
176
177 mask = priv->addWindowStackChanges (&xwc,
178@@ -4439,7 +4441,7 @@
179
180 if (sibling)
181 {
182- XWindowChanges xwc;
183+ XWindowChanges xwc = XWINDOWCHANGES_INIT;
184 int mask;
185
186 mask = priv->addWindowStackChanges (&xwc, sibling);
187@@ -4505,7 +4507,7 @@
188 void
189 CompWindow::restackBelow (CompWindow *sibling)
190 {
191- XWindowChanges xwc;
192+ XWindowChanges xwc = XWINDOWCHANGES_INIT;
193 unsigned int mask;
194
195 mask = priv->addWindowStackChanges (&xwc,
196@@ -4518,7 +4520,7 @@
197 void
198 CompWindow::updateAttributes (CompStackingUpdateMode stackingMode)
199 {
200- XWindowChanges xwc;
201+ XWindowChanges xwc = XWINDOWCHANGES_INIT;
202 int mask = 0;
203
204 if (overrideRedirect () || !priv->managed)
205@@ -4635,7 +4637,7 @@
206
207 if (dx || dy)
208 {
209- XWindowChanges xwc;
210+ XWindowChanges xwc = XWINDOWCHANGES_INIT;
211
212 xwc.x = serverGeometry.x () + dx;
213 xwc.y = serverGeometry.y () + dy;
214@@ -5739,7 +5741,7 @@
215 if (!priv->placed)
216 {
217 int gravity = priv->sizeHints.win_gravity;
218- XWindowChanges xwc;
219+ XWindowChanges xwc = XWINDOWCHANGES_INIT;
220 unsigned int xwcm;
221
222 /* adjust for gravity, but only for frame size */
223@@ -6040,7 +6042,7 @@
224 if (tx || ty)
225 {
226 unsigned int valueMask = CWX | CWY;
227- XWindowChanges xwc;
228+ XWindowChanges xwc = XWINDOWCHANGES_INIT;
229 int m, wx, wy;
230
231 if (!priv->managed)
232@@ -6893,7 +6895,7 @@
233 {
234 XSetWindowAttributes attr;
235 XWindowAttributes wa;
236- XWindowChanges xwc;
237+ XWindowChanges xwc = XWINDOWCHANGES_INIT;
238 int mask;
239 unsigned int nchildren;
240 Window *children, root_return, parent_return;
241@@ -7099,7 +7101,7 @@
242 Display *dpy = screen->dpy ();
243 XEvent e;
244 bool alive = true;
245- XWindowChanges xwc;
246+ XWindowChanges xwc = XWINDOWCHANGES_INIT;
247 unsigned int nchildren;
248 Window *children = NULL, root_return, parent_return;
249 XWindowAttributes wa;

Subscribers

People subscribed via source and target branches