diff options
author | Keith Packard <keithp@keithp.com> | 2014-12-16 17:05:18 -0800 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2015-03-31 12:07:56 +1000 |
commit | 7402eaa0185110a60cf4aae32d7b470c1372b45b (patch) | |
tree | 99c59333fc607ac5e80b1ad6c4bc72702df41d57 /src/Xrandr.c | |
parent | bc00b4fb0b52ed2f6f8544fa3b5da9693ee7ed90 (diff) | |
download | xorg-lib-libXrandr-7402eaa0185110a60cf4aae32d7b470c1372b45b.tar.gz |
libXrandr: Clean up compiler warnings
This removes warnings about shadowing local variables with the same
name, and type mismatches with _XRead32.
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/Xrandr.c')
-rw-r--r-- | src/Xrandr.c | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/src/Xrandr.c b/src/Xrandr.c index a9fba87..fd247e0 100644 --- a/src/Xrandr.c +++ b/src/Xrandr.c @@ -219,62 +219,62 @@ static Status XRREventToWire(Display *dpy, XEvent *event, xEvent *wire) awire->subCode = aevent->subtype; switch (aevent->subtype) { case RRNotify_OutputChange: { - xRROutputChangeNotifyEvent *awire = (xRROutputChangeNotifyEvent *) wire; - XRROutputChangeNotifyEvent *aevent = (XRROutputChangeNotifyEvent *) event; - awire->window = aevent->window; - awire->output = aevent->output; - awire->crtc = aevent->crtc; - awire->mode = aevent->mode; - awire->rotation = aevent->rotation; - awire->connection = aevent->connection; - awire->subpixelOrder = aevent->subpixel_order; + xRROutputChangeNotifyEvent *sawire = (xRROutputChangeNotifyEvent *) wire; + XRROutputChangeNotifyEvent *saevent = (XRROutputChangeNotifyEvent *) event; + sawire->window = saevent->window; + sawire->output = saevent->output; + sawire->crtc = saevent->crtc; + sawire->mode = saevent->mode; + sawire->rotation = saevent->rotation; + sawire->connection = saevent->connection; + sawire->subpixelOrder = saevent->subpixel_order; return True; } case RRNotify_CrtcChange: { - xRRCrtcChangeNotifyEvent *awire = (xRRCrtcChangeNotifyEvent *) wire; - XRRCrtcChangeNotifyEvent *aevent = (XRRCrtcChangeNotifyEvent *) event; - awire->window = aevent->window; - awire->crtc = aevent->crtc; - awire->mode = aevent->mode; - awire->rotation = aevent->rotation; - awire->x = aevent->x; - awire->y = aevent->y; - awire->width = aevent->width; - awire->height = aevent->height; + xRRCrtcChangeNotifyEvent *sawire = (xRRCrtcChangeNotifyEvent *) wire; + XRRCrtcChangeNotifyEvent *saevent = (XRRCrtcChangeNotifyEvent *) event; + sawire->window = saevent->window; + sawire->crtc = saevent->crtc; + sawire->mode = saevent->mode; + sawire->rotation = saevent->rotation; + sawire->x = saevent->x; + sawire->y = saevent->y; + sawire->width = saevent->width; + sawire->height = saevent->height; return True; } case RRNotify_OutputProperty: { - xRROutputPropertyNotifyEvent *awire = (xRROutputPropertyNotifyEvent *) wire; - XRROutputPropertyNotifyEvent *aevent = (XRROutputPropertyNotifyEvent *) event; - awire->window = aevent->window; - awire->output = aevent->output; - awire->atom = aevent->property; - awire->timestamp = aevent->timestamp; - awire->state = aevent->state; + xRROutputPropertyNotifyEvent *sawire = (xRROutputPropertyNotifyEvent *) wire; + XRROutputPropertyNotifyEvent *saevent = (XRROutputPropertyNotifyEvent *) event; + sawire->window = saevent->window; + sawire->output = saevent->output; + sawire->atom = saevent->property; + sawire->timestamp = saevent->timestamp; + sawire->state = saevent->state; return True; } case RRNotify_ProviderChange: { - xRRProviderChangeNotifyEvent *awire = (xRRProviderChangeNotifyEvent *) wire; - XRRProviderChangeNotifyEvent *aevent = (XRRProviderChangeNotifyEvent *) event; - awire->window = aevent->window; - awire->provider = aevent->provider; + xRRProviderChangeNotifyEvent *sawire = (xRRProviderChangeNotifyEvent *) wire; + XRRProviderChangeNotifyEvent *saevent = (XRRProviderChangeNotifyEvent *) event; + sawire->window = saevent->window; + sawire->provider = saevent->provider; return True; } case RRNotify_ProviderProperty: { - xRRProviderPropertyNotifyEvent *awire = (xRRProviderPropertyNotifyEvent *) wire; - XRRProviderPropertyNotifyEvent *aevent = (XRRProviderPropertyNotifyEvent *) event; - awire->window = aevent->window; - awire->provider = aevent->provider; - awire->atom = aevent->property; - awire->timestamp = aevent->timestamp; - awire->state = aevent->state; + xRRProviderPropertyNotifyEvent *sawire = (xRRProviderPropertyNotifyEvent *) wire; + XRRProviderPropertyNotifyEvent *saevent = (XRRProviderPropertyNotifyEvent *) event; + sawire->window = saevent->window; + sawire->provider = saevent->provider; + sawire->atom = saevent->property; + sawire->timestamp = saevent->timestamp; + sawire->state = saevent->state; return True; } case RRNotify_ResourceChange: { - xRRResourceChangeNotifyEvent *awire = (xRRResourceChangeNotifyEvent *) wire; - XRRResourceChangeNotifyEvent *aevent = (XRRResourceChangeNotifyEvent *) event; - awire->window = aevent->window; - awire->timestamp = aevent->timestamp; + xRRResourceChangeNotifyEvent *sawire = (xRRResourceChangeNotifyEvent *) wire; + XRRResourceChangeNotifyEvent *saevent = (XRRResourceChangeNotifyEvent *) event; + sawire->window = saevent->window; + sawire->timestamp = saevent->timestamp; return True; } } |