From 03a4b57a7fc73dcce6e6698a98972fa4a1d23e7c Mon Sep 17 00:00:00 2001
From: David Reveman <davidr@novell.com>
Date: Wed, 4 Jun 2008 14:08:05 -0400
Subject: [PATCH] Fix return status for dmx examples and have dmxaddscreen
 print the attachment screen number.

---
 hw/dmx/examples/dmxaddinput.c  | 16 ++++++----------
 hw/dmx/examples/dmxaddscreen.c | 22 ++++++++++++----------
 hw/dmx/examples/dmxresize.c    |  2 +-
 hw/dmx/examples/dmxrminput.c   |  2 +-
 hw/dmx/examples/dmxrmscreen.c  |  6 +++++-
 5 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/hw/dmx/examples/dmxaddinput.c b/hw/dmx/examples/dmxaddinput.c
index dcfd4f5cc..c2eecf322 100644
--- a/hw/dmx/examples/dmxaddinput.c
+++ b/hw/dmx/examples/dmxaddinput.c
@@ -46,29 +46,25 @@ int main(int argc, char **argv)
     int                  status;
 
     if (argc != 5) {
-        printf("Usage: %s display c|b name|screen isCore\n", argv[0]);
+        fprintf(stderr, "Usage: %s display c|b name|screen isCore\n", argv[0]);
         return -1;
     }
 
     if (!(display = XOpenDisplay(argv[1]))) {
-        printf("Cannot open display %s\n", argv[1]);
+        fprintf(stderr, "Cannot open display %s\n", argv[1]);
         return -1;
     }
 
     if (!DMXQueryExtension(display, &event_base, &error_base)) {
-        printf("DMX extension not present\n");
+        fprintf(stderr, "DMX extension not present\n");
         return -1;
     }
-    printf("DMX extension present: event_base = %d, error_base = %d\n",
-           event_base, error_base);
 
     if (!DMXQueryVersion(display,
                          &major_version, &minor_version, &patch_version)) {
-        printf("Could not get extension version\n");
+        fprintf(stderr, "Could not get extension version\n");
         return -1;
     }
-    printf("Extension version: %d.%d patch %d\n",
-           major_version, minor_version, patch_version);
 
     if (argv[2][0] == 'c') {
         status = DMXAddConsoleInput(display, argv[3], atoi(argv[4]), &id);
@@ -76,8 +72,8 @@ int main(int argc, char **argv)
         status = DMXAddBackendInput(display, atoi(argv[3]), atoi(argv[4]),&id);
     }
 
-    printf("status = %d, id = %d\n", status, id);
+    printf ("%d", id);
 
     XCloseDisplay(display);
-    return 0;
+    return status ? 0 : -1;
 }
diff --git a/hw/dmx/examples/dmxaddscreen.c b/hw/dmx/examples/dmxaddscreen.c
index 8e60872df..9c93c9cec 100644
--- a/hw/dmx/examples/dmxaddscreen.c
+++ b/hw/dmx/examples/dmxaddscreen.c
@@ -48,12 +48,12 @@ int main(int argc, char **argv)
     unsigned int         mask = 0;
 
     if (argc != 4 && argc != 14) {
-        printf("Usage: %s display screenNum displayName [scrnx scrny scrnw scrnh rootx rooty rootw rooth originx originy]\n", argv[0]);
+        fprintf(stderr, "Usage: %s display screenNum displayName [scrnx scrny scrnw scrnh rootx rooty rootw rooth originx originy]\n", argv[0]);
         return -1;
     }
 
     if (!(display = XOpenDisplay(argv[1]))) {
-        printf("Cannot open display %s\n", argv[1]);
+        fprintf(stderr, "Cannot open display %s\n", argv[1]);
         return -1;
     }
 
@@ -83,23 +83,25 @@ int main(int argc, char **argv)
     }
 
     if (!DMXQueryExtension(display, &event_base, &error_base)) {
-        printf("DMX extension not present\n");
+        fprintf(stderr, "DMX extension not present\n");
         return -1;
     }
-    printf("DMX extension present: event_base = %d, error_base = %d\n",
-           event_base, error_base);
 
     if (!DMXQueryVersion(display,
                          &major_version, &minor_version, &patch_version)) {
-        printf("Could not get extension version\n");
+        fprintf(stderr, "Could not get extension version\n");
         return -1;
     }
-    printf("Extension version: %d.%d patch %d\n",
-           major_version, minor_version, patch_version);
 
     if (!DMXAddScreen(display, argv[3], mask, &attr, &screenNum))
-	printf("Failed to add %s as screen #%d\n", argv[2], screenNum);
-    
+    {
+	fprintf(stderr, "Failed to add %s as screen #%d\n", argv[3], screenNum);
+	XCloseDisplay(display);
+	return -1;
+    }
+
+    printf ("%d", screenNum);
+
     XCloseDisplay(display);
     return 0;
 }
diff --git a/hw/dmx/examples/dmxresize.c b/hw/dmx/examples/dmxresize.c
index caed91d8d..6110b97c5 100644
--- a/hw/dmx/examples/dmxresize.c
+++ b/hw/dmx/examples/dmxresize.c
@@ -100,5 +100,5 @@ int main(int argc, char **argv)
     }
     
     XCloseDisplay(display);
-    return 0;
+    return (status == Success) ? 0 : -1;
 }
diff --git a/hw/dmx/examples/dmxrminput.c b/hw/dmx/examples/dmxrminput.c
index ef62cab8b..defe68d46 100644
--- a/hw/dmx/examples/dmxrminput.c
+++ b/hw/dmx/examples/dmxrminput.c
@@ -74,5 +74,5 @@ int main(int argc, char **argv)
     printf("status = %d\n", status);
 
     XCloseDisplay(display);
-    return 0;
+    return status ? 0 : -1;
 }
diff --git a/hw/dmx/examples/dmxrmscreen.c b/hw/dmx/examples/dmxrmscreen.c
index fecf0f6c1..59a38d6e3 100644
--- a/hw/dmx/examples/dmxrmscreen.c
+++ b/hw/dmx/examples/dmxrmscreen.c
@@ -73,8 +73,12 @@ int main(int argc, char **argv)
            major_version, minor_version, patch_version);
 
     if (!DMXRemoveScreen(display, screenNum))
+    {
         printf("Failed to remove screen #%d\n", screenNum);
-    
+	XCloseDisplay(display);
+	return -1;
+    }
+
     XCloseDisplay(display);
     return 0;
 }