Updating branch refs/heads/master
to 8a4e2db7a8660f2e0bddf2ee63b354c4afa808f0 (commit)
from 2ac9aa0a83c206bf2ad711ac2c90ed1bd7647464 (commit)
commit 8a4e2db7a8660f2e0bddf2ee63b354c4afa808f0
Author: Lionel Le Folgoc <[email protected]>
Date: Sun Jun 27 11:09:46 2010 +0200
Duplicate memory instead of looping
xfce4-settings-helper/displays.c | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/xfce4-settings-helper/displays.c b/xfce4-settings-helper/displays.c
index 9b0b404..3e4bde8 100644
--- a/xfce4-settings-helper/displays.c
+++ b/xfce4-settings-helper/displays.c
@@ -227,7 +227,7 @@ xfce_displays_helper_list_crtcs (Display
*xdisplay,
{
XfceRRCrtc *crtcs;
XRRCrtcInfo *crtc_info;
- gint n, m;
+ gint n;
g_return_val_if_fail (xdisplay != NULL, NULL);
g_return_val_if_fail (resources != NULL, NULL);
@@ -243,22 +243,19 @@ xfce_displays_helper_list_crtcs (Display
*xdisplay,
crtcs[n].rotations = crtc_info->rotations;
crtcs[n].x = crtc_info->x;
crtcs[n].y = crtc_info->y;
+
crtcs[n].noutput = crtc_info->noutput;
crtcs[n].outputs = NULL;
if (crtc_info->noutput > 0)
- {
- crtcs[n].outputs = g_new0 (RROutput, crtc_info->noutput);
- for (m = 0; m < crtc_info->noutput; ++m)
- crtcs[n].outputs[m] = crtc_info->outputs[m];
- }
+ crtcs[n].outputs = g_memdup (crtc_info->outputs,
+ crtc_info->noutput * sizeof
(RROutput));
+
crtcs[n].npossible = crtc_info->npossible;
crtcs[n].possible = NULL;
if (crtc_info->npossible > 0)
- {
- crtcs[n].possible = g_new0 (RROutput, crtc_info->npossible);
- for (m = 0; m < crtc_info->npossible; ++m)
- crtcs[n].possible[m] = crtc_info->possible[m];
- }
+ crtcs[n].possible = g_memdup (crtc_info->possible,
+ crtc_info->npossible * sizeof
(RROutput));
+
crtcs[n].processed = FALSE;
XRRFreeCrtcInfo (crtc_info);
}
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
