libhal_free.patch - illumos gate - illumos

Bug #2555 » libhal_free.patch

suggested fix - Milan Jurik, 2012-03-30 06:15 PM

      * libhal.c : HAL daemon C convenience library
+     *
      * Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
      * Copyright (C) 2006 Sjoerd Simons, <sjoerd@luon.net>
      * Copyright (C) 2007 Codethink Ltd. Author Rob Taylor <rob.taylor@codethink.co.uk>
+     *
      * Licensed under the Academic Free License version 2.1
-...
     static dbus_bool_t libhal_property_fill_value_from_variant (LibHalProperty *p, DBusMessageIter *var_iter);
     /**
     /**
      * libhal_free_string_array:
      * @str_array: the array to be freed
+     *
-...
+    }
     /**
     /**
      * libhal_free_string:
      * @str: the nul-terminated sting to free
+     *
-...
     				      *	  if there are no properties */
     };
     /**
     /**
      * LibHalProperty:
+     *
      * Represents a property. Opaque.
-...
     				      *	  the last */
     };
     /**
     /**
      * LibHalContext:
+     *
      * Context for connection to the HAL daemon. Opaque, use the
-...
     	result = malloc (sizeof (LibHalPropertySet));
     	if (result == NULL)
     		goto oom;
     /*
         result->properties = malloc(sizeof(LibHalProperty)*result->num_properties);
         if( result->properties==NULL )
-...
     LibHalPropertyType
     libhal_ps_get_type (const LibHalPropertySet *set, const char *key)
+    {
     	LibHalProperty *p = property_set_lookup (set, key);
     	LibHalProperty *p;
     	LIBHAL_CHECK_PARAM_VALID(set, "*set", LIBHAL_PROPERTY_TYPE_INVALID);
     	LIBHAL_CHECK_PARAM_VALID(key, "*key", LIBHAL_PROPERTY_TYPE_INVALID);
-...
+    }
     /**
     /**
      * libhal_psi_init:
      * @iter: iterator object
      * @set: property set to iterate over
-...
     	return iter->idx < iter->set->num_properties;
+    }
     /**
     /**
      * libhal_psi_next:
      * @iter: iterator object
+     *
-...
     	return iter->cur_prop->type;
+    }
     /**
     /**
      * libhal_psi_get_key:
      * @iter: iterator object
+     *
-...
     	return iter->cur_prop->key;
+    }
     /**
     /**
      * libhal_psi_get_string:
      * @iter: iterator object
+     *
-...
     	return iter->cur_prop->v.str_value;
+    }
     /**
     /**
      * libhal_psi_get_int:
      * @iter: iterator object
+     *
-...
     	return iter->cur_prop->v.uint64_value;
+    }
     /**
     /**
      * libhal_psi_get_double:
      * @iter: iterator object
+     *
-...
     	return iter->cur_prop->v.bool_value;
+    }
     /**
     /**
      * libhal_psi_get_strlist:
      * @iter: iterator object
+     *
-...
+    		}
     		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+    	}
     	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+    }
-...
     static dbus_bool_t libhal_already_initialized_once = FALSE;
     /**
     /**
      * libhal_get_all_devices:
      * @ctx: the context for the connection to hald
      * @num_devices: the number of devices will be stored here
-...
     	dbus_error_init (&_error);
     	reply = dbus_connection_send_with_reply_and_block (ctx->connection, message, -1, &_error);
     	dbus_message_unref (message);
     	dbus_move_error (&_error, error);
     	if (error != NULL && dbus_error_is_set (error)) {
     		dbus_message_unref (message);
     		return NULL;
+    	}
     	if (reply == NULL) {
     		dbus_message_unref (message);
     		return NULL;
+    	}
-...
     	if (dbus_message_iter_get_arg_type (&reply_iter) != DBUS_TYPE_ARRAY) {
     		fprintf (stderr, "%s %d : wrong reply from hald.  Expecting an array.\n", __FILE__, __LINE__);
     		dbus_message_unref (reply);
     		return NULL;
+    	}
-...
     	hal_device_names = libhal_get_string_array_from_iter (&iter_array, num_devices);
     	dbus_message_unref (reply);
     	dbus_message_unref (message);
     	return hal_device_names;
+    }
     /**
     /**
      * libhal_device_get_property_type:
      * @ctx: the context for the connection to hald
      * @udi: the Unique Device Id
-...
     							   message, -1,
     							   &_error);
     	dbus_message_unref (message);
     	dbus_move_error (&_error, error);
     	if (error != NULL && dbus_error_is_set (error)) {
     		dbus_message_unref (message);
     		return LIBHAL_PROPERTY_TYPE_INVALID;
+    	}
     	if (reply == NULL) {
     		dbus_message_unref (message);
     		return LIBHAL_PROPERTY_TYPE_INVALID;
+    	}
     	dbus_message_iter_init (reply, &reply_iter);
     	dbus_message_iter_get_basic (&reply_iter, &type);
     	dbus_message_unref (message);
     	dbus_message_unref (reply);
     	return type;
+    }
     /**
     /**
      * libhal_device_get_property_strlist:
      * @ctx: the context for the connection to hald
      * @udi: unique Device Id
-...
     							   message, -1,
     							   &_error);
     	dbus_message_unref (message);
     	dbus_move_error (&_error, error);
     	if (error != NULL && dbus_error_is_set (error)) {
     		dbus_message_unref (message);
     		return NULL;
+    	}
     	if (reply == NULL) {
     		dbus_message_unref (message);
     		return NULL;
+    	}
     	/* now analyse reply */
-...
     	if (dbus_message_iter_get_arg_type (&reply_iter) != DBUS_TYPE_ARRAY) {
     		fprintf (stderr, "%s %d : wrong reply from hald.  Expecting an array.\n", __FILE__, __LINE__);
     		dbus_message_unref (reply);
     		return NULL;
+    	}
-...
     	our_strings = libhal_get_string_array_from_iter (&iter_array, NULL);
     	dbus_message_unref (reply);
     	dbus_message_unref (message);
     	return our_strings;
+    }
     /**
     /**
      * libhal_device_get_property_string:
      * @ctx: the context for the connection to hald
      * @udi: the Unique Device Id
-...
     							   message, -1,
     							   &_error);
     	dbus_message_unref (message);
     	dbus_move_error (&_error, error);
     	if (error != NULL && dbus_error_is_set (error)) {
     		dbus_message_unref (message);
     		return NULL;
+    	}
     	if (reply == NULL) {
     		dbus_message_unref (message);
     		return NULL;
+    	}
-...
     	/* now analyze reply */
     	if (dbus_message_iter_get_arg_type (&reply_iter) !=
     		   DBUS_TYPE_STRING) {
     		dbus_message_unref (message);
     		dbus_message_unref (reply);
     		return NULL;
+    	}
-...
     	if (value == NULL) {
     		fprintf (stderr, "%s %d : error allocating memory\n",
     			 __FILE__, __LINE__);
     		/** @todo FIXME cleanup */
     		return NULL;
+    	}
     	dbus_message_unref (message);
     	dbus_message_unref (reply);
     	return value;
+    }
     /**
     /**
      * libhal_device_get_property_int:
      * @ctx: the context for the connection to hald
      * @udi: the Unique Device Id
-...
     							   message, -1,
     							   &_error);
     	dbus_message_unref (message);
     	dbus_move_error (&_error, error);
     	if (error != NULL && dbus_error_is_set (error)) {
     		dbus_message_unref (message);
     		return -1;
+    	}
     	if (reply == NULL) {
     		dbus_message_unref (message);
     		return -1;
+    	}
-...
     			 "%s %d : property '%s' for device '%s' is not "
     			 "of type integer\n", __FILE__, __LINE__, key,
     			 udi);
     		dbus_message_unref (message);
     		dbus_message_unref (reply);
     		return -1;
+    	}
     	dbus_message_iter_get_basic (&reply_iter, &value);
     	dbus_message_unref (message);
     	dbus_message_unref (reply);
     	return value;
+    }
     /**
     /**
      * libhal_device_get_property_uint64:
      * @ctx: the context for the connection to hald
      * @udi: the Unique Device Id
-...
     	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
     							   message, -1,
     							   &_error);
     	dbus_message_unref (message);
     	dbus_move_error (&_error, error);
     	if (error != NULL && dbus_error_is_set (error)) {
     		dbus_message_unref (message);
     		return -1;
+    	}
     	if (reply == NULL) {
     		dbus_message_unref (message);
     		return -1;
+    	}
-...
     			 "%s %d : property '%s' for device '%s' is not "
     			 "of type integer\n", __FILE__, __LINE__, key,
     			 udi);
     		dbus_message_unref (message);
     		dbus_message_unref (reply);
     		return -1;
+    	}
     	dbus_message_iter_get_basic (&reply_iter, &value);
     	dbus_message_unref (message);
     	dbus_message_unref (reply);
     	return value;
+    }
     /**
     /**
      * libhal_device_get_property_double:
      * @ctx: the context for the connection to hald
      * @udi: the Unique Device Id
-...
     							   message, -1,
     							   &_error);
     	dbus_message_unref (message);
     	dbus_move_error (&_error, error);
     	if (error != NULL && dbus_error_is_set (error)) {
     		dbus_message_unref (message);
     		return -1.0f;
+    	}
     	if (reply == NULL) {
     		dbus_message_unref (message);
     		return -1.0f;
+    	}
-...
     		fprintf (stderr,
     			 "%s %d : property '%s' for device '%s' is not "
     			 "of type double\n", __FILE__, __LINE__, key, udi);
     		dbus_message_unref (message);
     		dbus_message_unref (reply);
     		return -1.0f;
+    	}
     	dbus_message_iter_get_basic (&reply_iter, &value);
     	dbus_message_unref (message);
     	dbus_message_unref (reply);
     	return (double) value;
+    }
     /**
     /**
      * libhal_device_get_property_bool:
      * @ctx: the context for the connection to hald
      * @udi: the Unique Device Id
-...
     							   message, -1,
     							   &_error);
     	dbus_message_unref (message);
     	dbus_move_error (&_error, error);
     	if (error != NULL && dbus_error_is_set (error)) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
     	if (reply == NULL) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
-...
     		fprintf (stderr,
     			 "%s %d : property '%s' for device '%s' is not "
     			 "of type bool\n", __FILE__, __LINE__, key, udi);
     		dbus_message_unref (message);
     		dbus_message_unref (reply);
     		return FALSE;
+    	}
     	dbus_message_iter_get_basic (&reply_iter, &value);
     	dbus_message_unref (message);
     	dbus_message_unref (reply);
     	return value;
+    }
-...
     	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
     							   message, -1,
     							   error);
     	dbus_message_unref (message);
     	if (error != NULL && dbus_error_is_set (error)) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
     	if (reply == NULL) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
     	dbus_message_unref (message);
     	dbus_message_unref (reply);
     	return TRUE;
+    }
     /**
     /**
      * libhal_device_set_property_string:
      * @ctx: the context for the connection to hald
      * @udi: the Unique Device Id
-...
     						  value, 0, 0, 0.0f, FALSE, error);
+    }
     /**
     /**
      * libhal_device_set_property_int:
      * @ctx: the context for the connection to hald
      * @udi: the Unique Device Id
-...
     						  NULL, value, 0, 0.0f, FALSE, error);
+    }
     /**
     /**
      * libhal_device_set_property_uint64:
      * @ctx: the context for the connection to hald
      * @udi: the Unique Device Id
-...
     						  NULL, 0, value, 0.0f, FALSE, error);
+    }
     /**
     /**
      * libhal_device_set_property_double:
      * @ctx: the context for the connection to hald
      * @udi: the Unique Device Id
-...
     						  NULL, 0, 0, value, FALSE, error);
+    }
     /**
     /**
      * libhal_device_set_property_bool:
      * @ctx: the context for the connection to hald
      * @udi: the Unique Device Id
-...
+    }
     /**
     /**
      * libhal_device_remove_property:
      * @ctx: the context for the connection to hald
      * @udi: the Unique Device Id
-...
     	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
     							   message, -1,
     							   error);
     	dbus_message_unref (message);
     	if (error != NULL && dbus_error_is_set (error)) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
     	if (reply == NULL) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
     	dbus_message_unref (reply);
     	return TRUE;
+    }
     /**
     /**
      * libhal_device_property_strlist_prepend:
      * @ctx: the context for the connection to hald
      * @udi: the Unique Device Id
-...
     	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
     							   message, -1,
     							   error);
     	dbus_message_unref (message);
     	if (error != NULL && dbus_error_is_set (error)) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
     	if (reply == NULL) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
     	dbus_message_unref (reply);
     	return TRUE;
+    }
     /**
     /**
      * libhal_device_property_strlist_remove_index:
      * @ctx: the context for the connection to hald
      * @udi: the Unique Device Id
-...
     	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
     							   message, -1,
     							   error);
     	dbus_message_unref (message);
     	if (error != NULL && dbus_error_is_set (error)) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
     	if (reply == NULL) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
     	dbus_message_unref (reply);
     	return TRUE;
+    }
     /**
     /**
      * libhal_device_property_strlist_remove:
      * @ctx: the context for the connection to hald
      * @udi: the Unique Device Id
-...
     	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
     							   message, -1,
     							   error);
     	dbus_message_unref (message);
     	if (error != NULL && dbus_error_is_set (error)) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
     	if (reply == NULL) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
     	dbus_message_unref (reply);
     	return TRUE;
+    }
     /**
     /**
      * libhal_device_lock:
      * @ctx: the context for the connection to hald
      * @udi: the Unique Device Id
-...
     							   message, -1,
     							   error);
     	dbus_message_unref (message);
     	if (error != NULL && dbus_error_is_set (error)) {
     		if (strcmp (error->name,
     			    "org.freedesktop.Hal.DeviceAlreadyLocked") == 0) {
     			if (reason_why_locked != NULL) {
     				*reason_why_locked =
     					dbus_malloc0 (strlen (error->message) + 1);
     				if (*reason_why_locked == NULL)
     					return FALSE;
     				strcpy (*reason_why_locked, error->message);
+    			}
+    		}
     		dbus_message_unref (message);
     		return FALSE;
+    	}
     	dbus_message_unref (message);
     	if (reply == NULL)
     		return FALSE;
-...
     	return TRUE;
+    }
     /**
     /**
      * libhal_device_unlock:
      * @ctx: the context for the connection to hald
      * @udi: the Unique Device Id
-...
     							   message, -1,
     							   error);
     	dbus_message_unref (message);
     	if (error != NULL && dbus_error_is_set (error)) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
     	dbus_message_unref (message);
     	if (reply == NULL)
     		return FALSE;
-...
+    }
     /**
     /**
      * libhal_new_device:
      * @ctx: the context for the connection to hald
      * @error: pointer to an initialized dbus error object for returning errors or NULL
-...
     	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
     							   message, -1,
     							   error);
     	dbus_message_unref (message);
     	if (error != NULL && dbus_error_is_set (error)) {
     		dbus_message_unref (message);
     		return NULL;
+    	}
     	if (reply == NULL) {
     		dbus_message_unref (message);
     		return NULL;
+    	}
-...
     		fprintf (stderr,
     			 "%s %d : expected a string in reply to NewDevice\n",
     			 __FILE__, __LINE__);
     		dbus_message_unref (message);
     		dbus_message_unref (reply);
     		return NULL;
+    	}
-...
     			 __FILE__, __LINE__);
+    	}
     	dbus_message_unref (message);
     	dbus_message_unref (reply);
     	return value;
+    }
     /**
     /**
      * libhal_device_commit_to_gdl:
      * @ctx: the context for the connection to hald
      * @temp_udi: the temporary unique device id as returned by libhal_new_device()
-...
     	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
     							   message, -1,
     							   error);
     	dbus_message_unref (message);
     	if (error != NULL && dbus_error_is_set (error)) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
     	if (reply == NULL) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
     	dbus_message_unref (message);
     	dbus_message_unref (reply);
     	return TRUE;
+    }
     /**
     /**
      * libhal_remove_device:
      * @ctx: the context for the connection to hald
      * @udi: the Unique device id.
-...
     	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
     							   message, -1,
     							   error);
     	dbus_message_unref (message);
     	if (error != NULL && dbus_error_is_set (error)) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
     	if (reply == NULL) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
     	dbus_message_unref (message);
     	dbus_message_unref (reply);
     	return TRUE;
+    }
     /**
     /**
      * libhal_device_exists:
      * @ctx: the context for the connection to hald
      * @udi: the Unique device id.
-...
     							   message, -1,
     							   &_error);
     	dbus_message_unref (message);
     	dbus_move_error (&_error, error);
     	if (error != NULL && dbus_error_is_set (error)) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
     	if (reply == NULL) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
-...
     		fprintf (stderr,
     			 "%s %d : expected a bool in reply to DeviceExists\n",
     			 __FILE__, __LINE__);
     		dbus_message_unref (message);
     		dbus_message_unref (reply);
     		return FALSE;
+    	}
     	dbus_message_iter_get_basic (&reply_iter, &value);
     	dbus_message_unref (message);
     	dbus_message_unref (reply);
     	return value;
+    }
     /**
     /**
      * libhal_device_property_exists:
      * @ctx: the context for the connection to hald
      * @udi: the Unique device id.
-...
     							   message, -1,
     							   &_error);
     	dbus_message_unref (message);
     	dbus_move_error (&_error, error);
     	if (error != NULL && dbus_error_is_set (error)) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
     	if (reply == NULL) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
-...
     	if (dbus_message_iter_get_arg_type (&reply_iter) != DBUS_TYPE_BOOLEAN) {
     		fprintf (stderr, "%s %d : expected a bool in reply to "
     			 "PropertyExists\n", __FILE__, __LINE__);
     		dbus_message_unref (message);
     		dbus_message_unref (reply);
     		return FALSE;
+    	}
     	dbus_message_iter_get_basic (&reply_iter, &value);
     	dbus_message_unref (message);
     	dbus_message_unref (reply);
     	return value;
+    }
     /**
     /**
      * libhal_merge_properties:
      * @ctx: the context for the connection to hald
      * @target_udi: the Unique device id of target device to merge to
-...
     	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
     							   message, -1,
     							   error);
     	dbus_message_unref (message);
     	if (error != NULL && dbus_error_is_set (error)) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
     	if (reply == NULL) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
     	dbus_message_unref (message);
     	dbus_message_unref (reply);
     	return TRUE;
+    }
-...
     							   message, -1,
     							   &_error);
     	dbus_message_unref (message);
     	dbus_move_error (&_error, error);
     	if (error != NULL && dbus_error_is_set (error)) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
     	if (reply == NULL) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
     	/* now analyse reply */
-...
     		fprintf (stderr,
     			 "%s %d : expected a bool in reply to DeviceMatches\n",
     			 __FILE__, __LINE__);
     		dbus_message_unref (message);
     		dbus_message_unref (reply);
     		return FALSE;
+    	}
     	dbus_message_iter_get_basic (&reply_iter, &value);
     	dbus_message_unref (message);
     	dbus_message_unref (reply);
     	return value;
+    }
     /**
     /**
      * libhal_device_print:
      * @ctx: the context for the connection to hald
      * @udi: the Unique Device Id
-...
     	return TRUE;
+    }
     /**
     /**
      * libhal_manager_find_device_string_match:
      * @ctx: the context for the connection to hald
      * @key: name of the property
-...
     							   message, -1,
     							   &_error);
     	dbus_message_unref (message);
     	dbus_move_error (&_error, error);
     	if (error != NULL && dbus_error_is_set (error)) {
     		dbus_message_unref (message);
     		return NULL;
+    	}
     	if (reply == NULL) {
     		dbus_message_unref (message);
     		return NULL;
+    	}
     	/* now analyse reply */
-...
     	hal_device_names = libhal_get_string_array_from_iter (&iter_array, num_devices);
     	dbus_message_unref (reply);
     	dbus_message_unref (message);
     	return hal_device_names;
+    }
     /**
     /**
      * libhal_device_add_capability:
      * @ctx: the context for the connection to hald
      * @udi: the Unique Device Id
-...
     	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
     							   message, -1,
     							   error);
     	dbus_message_unref (message);
     	if (error != NULL && dbus_error_is_set (error)) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
     	if (reply == NULL) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
     	dbus_message_unref (reply);
     	dbus_message_unref (message);
     	return TRUE;
+    }
     /**
     /**
      * libhal_device_query_capability:
      * @ctx: the context for the connection to hald
      * @udi: the Unique Device Id
-...
     	return ret;
+    }
     /**
     /**
      * libhal_find_device_by_capability:
      * @ctx: the context for the connection to hald
      * @capability: the capability name
-...
     	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
     							   message, -1,
     							   &_error);
     	dbus_message_unref (message);
     	dbus_move_error (&_error, error);
     	if (error != NULL && dbus_error_is_set (error)) {
     		dbus_message_unref (message);
     		return NULL;
+    	}
     	if (reply == NULL) {
     		dbus_message_unref (message);
     		return NULL;
+    	}
     	/* now analyse reply */
-...
     	hal_device_names = libhal_get_string_array_from_iter (&iter_array, num_devices);
     	dbus_message_unref (reply);
     	dbus_message_unref (message);
     	return hal_device_names;
+    }
     /**
     /**
      * libhal_device_property_watch_all:
      * @ctx: the context for the connection to hald
      * @error: pointer to an initialized dbus error object for returning errors or NULL
-...
+    }
     /**
     /**
      * libhal_device_add_property_watch:
      * @ctx: the context for the connection to hald
      * @udi: the Unique Device Id
-...
+    }
     /**
     /**
      * libhal_device_remove_property_watch:
      * @ctx: the context for the connection to hald
      * @udi: the Unique Device Id
-...
+    }
     /**
     /**
      * libhal_ctx_new:
+     *
      * Create a new LibHalContext
-...
     	ctx = calloc (1, sizeof (LibHalContext));
     	if (ctx == NULL) {
     		fprintf (stderr,
     			 "%s %d : Failed to allocate %d bytes\n",
     			 __FILE__, __LINE__, sizeof (LibHalContext));
     			 "%s %d : Failed to allocate %lu bytes\n",
     			 __FILE__, __LINE__, (unsigned long) sizeof (LibHalContext));
     		return NULL;
+    	}
-...
     	return ctx;
+    }
     /**
     /**
      * libhal_ctx_set_cache:
      * @ctx: context to enable/disable cache for
      * @use_cache: whether or not to use cache
-...
     	return TRUE;
+    }
     /**
     /**
      * libhal_ctx_set_dbus_connection:
      * @ctx: context to set connection for
      * @conn: DBus connection to use
-...
     	return TRUE;
+    }
     /**
     /**
      * libhal_ctx_get_dbus_connection:
      * @ctx: context to get connection for
+     *
-...
     DBusConnection *
     libhal_ctx_get_dbus_connection (LibHalContext *ctx)
+    {
     	LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
     	LIBHAL_CHECK_LIBHALCONTEXT(ctx, NULL);
     	return ctx->connection;
+    }
     /**
     /**
      * libhal_ctx_init:
      * @ctx: Context for connection to hald (D-BUS connection should be set with libhal_ctx_set_dbus_connection)
      * @error: pointer to an initialized dbus error object for returning errors or NULL
-...
     	return TRUE;
+    }
     /**
     /**
      * libhal_ctx_init_direct:
      * @error: pointer to an initialized dbus error object for returning errors or NULL
+     *
-...
     	return ctx;
+    }
     /**
     /**
      * libhal_ctx_shutdown:
      * @ctx: the context for the connection to hald
      * @error: pointer to an initialized dbus error object for returning errors or NULL
-...
     				       "interface='org.freedesktop.Hal.Manager',"
     				       "sender='org.freedesktop.Hal',"
     				       "path='/org/freedesktop/Hal/Manager'", &myerror);
     		dbus_move_error(&myerror, error);
     		if (error != NULL && dbus_error_is_set(error)) {
     		dbus_move_error (&myerror, error);
     		if (error != NULL && dbus_error_is_set (error)) {
     			fprintf (stderr, "%s %d : Error unsubscribing to signals, error=%s\n",
     				 __FILE__, __LINE__, error->message);
     			/** @todo  clean up */
-...
     	return TRUE;
+    }
     /**
     /**
      * libhal_ctx_free:
      * @ctx: pointer to a LibHalContext
+     *
-...
     	return TRUE;
+    }
     /**
     /**
      * libhal_ctx_set_device_added:
      * @ctx: the context for the connection to hald
      * @callback: the function to call when a device is added
-...
     	return TRUE;
+    }
     /**
     /**
      * libhal_ctx_set_device_removed:
      * @ctx: the context for the connection to hald
      * @callback: the function to call when a device is removed
-...
     	return TRUE;
+    }
     /**
     /**
      * libhal_ctx_set_device_new_capability:
      * @ctx: the context for the connection to hald
      * @callback: the function to call when a device gains a new capability
-...
     	return TRUE;
+    }
     /**
     /**
      * libhal_ctx_set_device_lost_capability:
      * @ctx: the context for the connection to hald
      * @callback: the function to call when a device loses a capability
-...
     	return TRUE;
+    }
     /**
     /**
      * libhal_ctx_set_device_property_modified:
      * @ctx: the context for the connection to hald
      * @callback: the function to call when a property is modified on a device
-...
     	return TRUE;
+    }
     /**
     /**
      * libhal_ctx_set_device_condition:
      * @ctx: the context for the connection to hald
      * @callback: the function to call when a device emits a condition
-...
     	return TRUE;
+    }
     /**
     /**
      * libhal_string_array_length:
      * @str_array: array of strings to consider
+     *
-...
+    }
     /**
     /**
      * libhal_device_rescan:
      * @ctx: the context for the connection to hald
      * @udi: the Unique id of device
-...
     							   message, -1,
     							   error);
     	dbus_message_unref (message);
     	if (error != NULL && dbus_error_is_set (error)) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
     	dbus_message_unref (message);
     	if (reply == NULL)
     		return FALSE;
     	dbus_message_iter_init (reply, &reply_iter);
     	if (dbus_message_iter_get_arg_type (&reply_iter) !=
     		   DBUS_TYPE_BOOLEAN) {
     		dbus_message_unref (message);
     		dbus_message_unref (reply);
     		return FALSE;
+    	}
-...
     	return result;
+    }
     /**
     /**
      * libhal_device_reprobe:
      * @ctx: the context for the connection to hald
      * @udi: the Unique id of device
-...
     							   message, -1,
     							   error);
     	dbus_message_unref (message);
     	if (error != NULL && dbus_error_is_set (error)) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
     	dbus_message_unref (message);
     	if (reply == NULL)
     		return FALSE;
     	dbus_message_iter_init (reply, &reply_iter);
     	if (dbus_message_iter_get_arg_type (&reply_iter) !=
     		   DBUS_TYPE_BOOLEAN) {
     		dbus_message_unref (message);
     		dbus_message_unref (reply);
     		return FALSE;
+    	}
-...
     	return result;
+    }
     /**
     /**
      * libhal_device_emit_condition:
      * @ctx: the context for the connection to hald
      * @udi: the Unique Device Id
-...
     							   message, -1,
     							   error);
     	dbus_message_unref (message);
     	if (error != NULL && dbus_error_is_set (error)) {
     		dbus_message_unref (message);
     		fprintf (stderr,
     			 "%s %d : Failure sending D-BUS message: %s: %s\n",
     			 __FILE__, __LINE__, error->name, error->message);
     		return FALSE;
+    	}
     	dbus_message_unref (message);
     	if (reply == NULL)
     	if (reply == NULL) {
     		fprintf (stderr,
     			 "%s %d : Got no reply\n",
     			 __FILE__, __LINE__);
     		return FALSE;
+    	}
     	dbus_message_iter_init (reply, &reply_iter);
     	if (dbus_message_iter_get_arg_type (&reply_iter) !=
     		   DBUS_TYPE_BOOLEAN) {
     		dbus_message_unref (message);
     		dbus_message_unref (reply);
     		fprintf (stderr,
     			 "%s %d : Malformed reply\n",
     			 __FILE__, __LINE__);
     		return FALSE;
+    	}
     	dbus_message_iter_get_basic (&reply_iter, &result);
-...
     							   message, -1,
     							   error);
     	dbus_message_unref (message);
     	if (error != NULL && dbus_error_is_set (error)) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
     	dbus_message_unref (message);
     	if (reply == NULL)
     		return FALSE;
     	dbus_message_iter_init (reply, &reply_iter);
     	if (dbus_message_iter_get_arg_type (&reply_iter) != DBUS_TYPE_BOOLEAN) {
     		dbus_message_unref (message);
     		dbus_message_unref (reply);
     		return FALSE;
+    	}
-...
     	return result;
+    }
     /**
     /**
      * libhal_device_claim_interface:
      * @ctx: the context for the connection to hald
      * @udi: the Unique Device Id
-...
     							   message, -1,
     							   error);
     	dbus_message_unref (message);
     	if (error != NULL && dbus_error_is_set (error)) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
     	dbus_message_unref (message);
     	if (reply == NULL)
     		return FALSE;
     	dbus_message_iter_init (reply, &reply_iter);
     	if (dbus_message_iter_get_arg_type (&reply_iter) !=
     		   DBUS_TYPE_BOOLEAN) {
     		dbus_message_unref (message);
     		dbus_message_unref (reply);
     		return FALSE;
+    	}
-...
     /**
      * libhal_device_set_property_string:
      * libhal_changeset_set_property_string:
      * @changeset: the changeset
      * @key: key of property
      * @value: the value to set
-...
+    }
     /**
      * libhal_device_set_property_int:
      * libhal_changeset_set_property_int:
      * @changeset: the changeset
      * @key: key of property
      * @value: the value to set
-...
+    }
     /**
      * libhal_device_set_property_uint64:
      * libhal_changeset_set_property_uint64:
      * @changeset: the changeset
      * @key: key of property
      * @value: the value to set
-...
+    }
     /**
      * libhal_device_set_property_double:
      * libhal_changeset_set_property_double:
      * @changeset: the changeset
      * @key: key of property
      * @value: the value to set
-...
+    }
     /**
      * libhal_device_set_property_bool:
      * libhal_changeset_set_property_bool:
      * @changeset: the changeset
      * @key: key of property
      * @value: the value to set
-...
+    }
     /**
      * libhal_device_set_property_strlist:
      * libhal_changeset_set_property_strlist:
      * @changeset: the changeset
      * @key: key of property
      * @value: the value to set - NULL terminated array of strings
-...
     							   message, -1,
     							   &_error);
     	dbus_message_unref (message);
     	dbus_move_error (&_error, error);
     	if (error != NULL && dbus_error_is_set (error)) {
     		fprintf (stderr,
     			 "%s %d : %s\n",
     			 __FILE__, __LINE__, error->message);
     		dbus_message_unref (message);
     		return FALSE;
+    	}
     	if (reply == NULL) {
     		dbus_message_unref (message);
     		return FALSE;
+    	}
     	dbus_message_unref (reply);
     	return TRUE;
+    }

(1-1/1)

Project

General

Profile

illumos gate

Bug #2555 » libhal_free.patch