diff options
| author | Florian Müllner <fmuellner@gnome.org> | 2015-09-24 01:24:33 +0200 |
|---|---|---|
| committer | Florian Müllner <fmuellner@gnome.org> | 2015-09-24 03:08:22 +0200 |
| commit | bc00f118f3e0c3ae82c04a0c70a9118c9be5fa9f (patch) | |
| tree | 06b9490c9c4b0ab94151853afdd3d5f4290508fd /src/backends/x11/meta-monitor-manager-xrandr.c | |
| parent | 5801b5518fd89f8b84cd9e0930b1651a0e9ca5ec (diff) | |
| download | mutter-bc00f118f3e0c3ae82c04a0c70a9118c9be5fa9f.tar.gz | |
Avoid shadowing existing variables
Diffstat (limited to 'src/backends/x11/meta-monitor-manager-xrandr.c')
| -rw-r--r-- | src/backends/x11/meta-monitor-manager-xrandr.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/backends/x11/meta-monitor-manager-xrandr.c b/src/backends/x11/meta-monitor-manager-xrandr.c index dd10c38d2..900884170 100644 --- a/src/backends/x11/meta-monitor-manager-xrandr.c +++ b/src/backends/x11/meta-monitor-manager-xrandr.c @@ -1133,17 +1133,16 @@ meta_monitor_manager_xrandr_apply_configuration (MetaMonitorManager *manager, if (crtc_info->mode != NULL) { MetaMonitorMode *mode; - g_autofree XID *outputs = NULL; - unsigned int j, n_outputs; - int width, height; + g_autofree XID *output_ids = NULL; + unsigned int j, n_output_ids; Status ok; mode = crtc_info->mode; - n_outputs = crtc_info->outputs->len; - outputs = g_new (XID, n_outputs); + n_output_ids = crtc_info->outputs->len; + output_ids = g_new (XID, n_output_ids); - for (j = 0; j < n_outputs; j++) + for (j = 0; j < n_output_ids; j++) { MetaOutput *output; @@ -1152,7 +1151,7 @@ meta_monitor_manager_xrandr_apply_configuration (MetaMonitorManager *manager, output->is_dirty = TRUE; output->crtc = crtc; - outputs[j] = output->winsys_id; + output_ids[j] = output->winsys_id; } ok = XRRSetCrtcConfig (manager_xrandr->xdisplay, @@ -1162,7 +1161,7 @@ meta_monitor_manager_xrandr_apply_configuration (MetaMonitorManager *manager, crtc_info->x, crtc_info->y, (XID)mode->mode_id, meta_monitor_transform_to_xrandr (crtc_info->transform), - outputs, n_outputs); + output_ids, n_output_ids); if (ok != Success) { |