hal: Branch 'master'

[Danny Kukawka]

 tools/hal-device.c           |    2 +-
 tools/hal_find_by_property.c |    4 ++--
 tools/hal_get_property.c     |    2 +-
 tools/hal_set_property.c     |    2 +-
 tools/lshal.c                |    2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

New commits:
diff-tree 0a9965e4aa4ffc2f382d7fe1286937308439fd1f (from d1ae80ff0d035ef059f276db20a3cb9c0e0d7360)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Oct 13 11:46:03 2006 +0200

    replaced LIBHAL_FREE_DBUS_ERROR with dbus_error_free()
    
    Replaced _again_ usage of macro LIBHAL_FREE_DBUS_ERROR with
    dbus_error_free().
    
    NOTE: If you use dbus_error_is_set() to check if the error is set,
          you should not use LIBHAL_FREE_DBUS_ERROR to free the error.
          Better use dbus_error_free() directly in this case to avoid
          double call of dbus_error_is_set().

diff --git a/tools/hal-device.c b/tools/hal-device.c
index 3bbecd4..4c5678e 100644
--- a/tools/hal-device.c
+++ b/tools/hal-device.c
@@ -142,7 +142,7 @@ int main(int argc, char **argv)
 	if (!libhal_ctx_init(hal_ctx, &error)) {
 		if (dbus_error_is_set(&error)) {
 			fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-			LIBHAL_FREE_DBUS_ERROR (&error);
+			dbus_error_free (&error);
 		}
 		fprintf (stderr, "Could not initialise connection to hald.\n"
 				 "Normally this means the HAL daemon (hald) is not running or not ready.\n");
diff --git a/tools/hal_find_by_property.c b/tools/hal_find_by_property.c
index 09b1b55..ad3af56 100644
--- a/tools/hal_find_by_property.c
+++ b/tools/hal_find_by_property.c
@@ -156,7 +156,7 @@ main (int argc, char *argv[])
 	if (!libhal_ctx_init (hal_ctx, &error)) {
 		if (dbus_error_is_set(&error)) {
 			fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-			LIBHAL_FREE_DBUS_ERROR (&error);
+			dbus_error_free (&error);
 		}
 		fprintf (stderr, "Could not initialise connection to hald.\n"
 				 "Normally this means the HAL daemon (hald) is not running or not ready.\n");
@@ -168,7 +168,7 @@ main (int argc, char *argv[])
 
 	if (dbus_error_is_set (&error)) {
 		fprintf (stderr, "error: %s: %s\n", error.name, error.message);
-		LIBHAL_FREE_DBUS_ERROR (&error);
+		dbus_error_free (&error);
 		return 1;
 	}
 
diff --git a/tools/hal_get_property.c b/tools/hal_get_property.c
index 5145916..ca902e3 100644
--- a/tools/hal_get_property.c
+++ b/tools/hal_get_property.c
@@ -165,7 +165,7 @@ main (int argc, char *argv[])
 	if (!libhal_ctx_init (hal_ctx, &error)) {
 		if (dbus_error_is_set(&error)) {
 			fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-			LIBHAL_FREE_DBUS_ERROR (&error);
+			dbus_error_free (&error);
 		}
 		fprintf (stderr, "Could not initialise connection to hald.\n"
 				 "Normally this means the HAL daemon (hald) is not running or not ready.\n");
diff --git a/tools/hal_set_property.c b/tools/hal_set_property.c
index 78f24ee..8df3040 100644
--- a/tools/hal_set_property.c
+++ b/tools/hal_set_property.c
@@ -232,7 +232,7 @@ main (int argc, char *argv[])
 	if (!libhal_ctx_init (hal_ctx, &error)) {
 		if (dbus_error_is_set(&error)) {
 			fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-			LIBHAL_FREE_DBUS_ERROR (&error);
+			dbus_error_free (&error);
 		}
 		fprintf (stderr, "Could not initialise connection to hald.\n"
 				 "Normally this means the HAL daemon (hald) is not running or not ready.\n");
diff --git a/tools/lshal.c b/tools/lshal.c
index c072858..377708f 100644
--- a/tools/lshal.c
+++ b/tools/lshal.c
@@ -684,7 +684,7 @@ main (int argc, char *argv[])
 	if (!libhal_ctx_init (hal_ctx, &error)) {
 		if (dbus_error_is_set(&error)) {
 			fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-			LIBHAL_FREE_DBUS_ERROR (&error);
+			dbus_error_free (&error);
 		}
 		fprintf (stderr, "Could not initialise connection to hald.\n"
 				 "Normally this means the HAL daemon (hald) is not running or not ready.\n");