diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-15 21:35:41 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-15 21:35:41 +0000 |
| commit | 5e633abcca598289d0423d89bb400b41e6417259 (patch) | |
| tree | 74258f0d1f9f5f2b171d16fd9654a13803216c6f /xorg-server/config | |
| parent | b5d1fd89898edb34f73679b542c754d837d44cf8 (diff) | |
| download | vcxsrv-5e633abcca598289d0423d89bb400b41e6417259.tar.gz vcxsrv-5e633abcca598289d0423d89bb400b41e6417259.tar.bz2 vcxsrv-5e633abcca598289d0423d89bb400b41e6417259.zip | |
xserver libX11 libxcb mesa git update 15 Mar 2011
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);
}
|