diff options
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);
}
|