xserver: Branch 'master'

Keith Packard keithp at kemper.freedesktop.org
Mon Oct 3 11:54:10 PDT 2011


 hw/kdrive/src/kinfo.c |   12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

New commits:
commit 77743f877d573cdf70fcb5cb5897250f668ebf9b
Author: Jamey Sharp <jamey at minilop.net>
Date:   Mon Sep 26 22:38:44 2011 -0700

    kdrive: Fix build for opaque InputOption structure.
    
    Commit 05284a03f9002b03a66ae355b34790ec02b726f0 missed fixing up
    kdrive's use of the old non-opaque structure.
    
    Signed-off-by: Jamey Sharp <jamey at minilop.net>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/kdrive/src/kinfo.c b/hw/kdrive/src/kinfo.c
index 7055fbf..0055b16 100644
--- a/hw/kdrive/src/kinfo.c
+++ b/hw/kdrive/src/kinfo.c
@@ -134,19 +134,9 @@ KdNewPointer (void)
 void
 KdFreePointer(KdPointerInfo *pi)
 {
-    InputOption *option, *prev = NULL;
-
     free(pi->name);
     free(pi->path);
-
-    for (option = pi->options; option; option = option->next) {
-        free(prev);
-        free(option->key);
-        free(option->value);
-        prev = option;
-    }
-
-    free(prev);
+    input_option_free_list(&pi->options);
     free(pi);
 }
 


More information about the xorg-commit mailing list