diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-15 22:49:12 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-15 22:49:12 +0000 |
| commit | 8285341e69cd721c6871b553e45437c767200545 (patch) | |
| tree | 551508bddc84d1c16c15d961878cd2d2f6edb365 /xorg-server/config | |
| parent | 52b8618bfdaa4725fc403f50fe682d02e7f16435 (diff) | |
| parent | 5e633abcca598289d0423d89bb400b41e6417259 (diff) | |
| download | vcxsrv-8285341e69cd721c6871b553e45437c767200545.tar.gz vcxsrv-8285341e69cd721c6871b553e45437c767200545.tar.bz2 vcxsrv-8285341e69cd721c6871b553e45437c767200545.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/config')
| -rw-r--r-- | xorg-server/config/hal.c | 6 | ||||
| -rw-r--r-- | xorg-server/config/udev.c | 6 |
2 files changed, 6 insertions, 6 deletions
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);
}
|