From 5e633abcca598289d0423d89bb400b41e6417259 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 15 Mar 2011 21:35:41 +0000 Subject: xserver libX11 libxcb mesa git update 15 Mar 2011 --- xorg-server/config/hal.c | 6 +++--- xorg-server/config/udev.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'xorg-server/config') diff --git a/xorg-server/config/hal.c b/xorg-server/config/hal.c index 2aff6f9fd..929643653 100644 --- a/xorg-server/config/hal.c +++ b/xorg-server/config/hal.c @@ -392,10 +392,10 @@ unwind: free(driver); free(name); free(config_info); - while (!dev && (tmpo = options)) { + while ((tmpo = options)) { options = tmpo->next; - free(tmpo->key); - free(tmpo->value); + free(tmpo->key); /* NULL if dev != NULL */ + free(tmpo->value); /* NULL if dev != NULL */ free(tmpo); } diff --git a/xorg-server/config/udev.c b/xorg-server/config/udev.c index eeacff162..44319e4db 100644 --- a/xorg-server/config/udev.c +++ b/xorg-server/config/udev.c @@ -197,10 +197,10 @@ device_added(struct udev_device *udev_device) unwind: free(config_info); - while (!dev && (tmpo = options)) { + while ((tmpo = options)) { options = tmpo->next; - free(tmpo->key); - free(tmpo->value); + free(tmpo->key); /* NULL if dev != NULL */ + free(tmpo->value); /* NULL if dev != NULL */ free(tmpo); } -- cgit v1.2.3