hal/libhal libhal.c,1.53,1.54
David Zeuthen
david at freedesktop.org
Thu Jul 21 13:26:48 PDT 2005
Update of /cvs/hal/hal/libhal
In directory gabe:/tmp/cvs-serv22019/libhal
Modified Files:
libhal.c
Log Message:
2005-07-21 David Zeuthen <davidz at redhat.com>
* libhal-storage/libhal-storage.c, libhal/libhal.c: Move the
LIBHAL_CHECK_LIBHALCONTEXT down to after declerations so we
don't depend on C99.
Index: libhal.c
===================================================================
RCS file: /cvs/hal/hal/libhal/libhal.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- libhal.c 21 Jul 2005 19:03:34 -0000 1.53
+++ libhal.c 21 Jul 2005 20:26:46 -0000 1.54
@@ -339,9 +339,7 @@
*/
LibHalPropertySet *
libhal_device_get_all_properties (LibHalContext *ctx, const char *udi, DBusError *error)
-{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, NULL);
-
+{
DBusMessage *message;
DBusMessage *reply;
DBusMessageIter reply_iter;
@@ -349,6 +347,8 @@
LibHalPropertySet *result;
LibHalProperty *p_last;
DBusError _error;
+
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, NULL);
message = dbus_message_new_method_call ("org.freedesktop.Hal", udi,
"org.freedesktop.Hal.Device",
@@ -913,15 +913,15 @@
*/
char **
libhal_get_all_devices (LibHalContext *ctx, int *num_devices, DBusError *error)
-{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, NULL);
-
+{
DBusMessage *message;
DBusMessage *reply;
DBusMessageIter iter_array, reply_iter;
char **hal_device_names;
DBusError _error;
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, NULL);
+
*num_devices = 0;
message = dbus_message_new_method_call ("org.freedesktop.Hal",
@@ -980,13 +980,13 @@
LibHalPropertyType
libhal_device_get_property_type (LibHalContext *ctx, const char *udi, const char *key, DBusError *error)
{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, LIBHAL_PROPERTY_TYPE_INVALID); // or return NULL?
-
DBusMessage *message;
DBusMessage *reply;
DBusMessageIter iter, reply_iter;
int type;
DBusError _error;
+
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, LIBHAL_PROPERTY_TYPE_INVALID); // or return NULL?
message = dbus_message_new_method_call ("org.freedesktop.Hal", udi,
"org.freedesktop.Hal.Device",
@@ -1040,15 +1040,15 @@
*/
char **
libhal_device_get_property_strlist (LibHalContext *ctx, const char *udi, const char *key, DBusError *error)
-{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, NULL);
-
+{
DBusMessage *message;
DBusMessage *reply;
DBusMessageIter iter, iter_array, reply_iter;
char **our_strings;
DBusError _error;
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, NULL);
+
message = dbus_message_new_method_call ("org.freedesktop.Hal", udi,
"org.freedesktop.Hal.Device",
"GetPropertyStringList");
@@ -1110,9 +1110,7 @@
char *
libhal_device_get_property_string (LibHalContext *ctx,
const char *udi, const char *key, DBusError *error)
-{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, NULL);
-
+{
DBusMessage *message;
DBusMessage *reply;
DBusMessageIter iter, reply_iter;
@@ -1120,6 +1118,8 @@
char *dbus_str;
DBusError _error;
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, NULL);
+
message = dbus_message_new_method_call ("org.freedesktop.Hal", udi,
"org.freedesktop.Hal.Device",
"GetPropertyString");
@@ -1186,14 +1186,14 @@
libhal_device_get_property_int (LibHalContext *ctx,
const char *udi, const char *key, DBusError *error)
{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, -1);
-
DBusMessage *message;
DBusMessage *reply;
DBusMessageIter iter, reply_iter;
dbus_int32_t value;
DBusError _error;
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, -1);
+
message = dbus_message_new_method_call ("org.freedesktop.Hal", udi,
"org.freedesktop.Hal.Device",
"GetPropertyInteger");
@@ -1255,14 +1255,14 @@
libhal_device_get_property_uint64 (LibHalContext *ctx,
const char *udi, const char *key, DBusError *error)
{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, -1);
-
DBusMessage *message;
DBusMessage *reply;
DBusMessageIter iter, reply_iter;
dbus_uint64_t value;
DBusError _error;
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, -1);
+
message = dbus_message_new_method_call ("org.freedesktop.Hal", udi,
"org.freedesktop.Hal.Device",
"GetPropertyInteger");
@@ -1323,14 +1323,14 @@
libhal_device_get_property_double (LibHalContext *ctx,
const char *udi, const char *key, DBusError *error)
{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, -1.0);
-
DBusMessage *message;
DBusMessage *reply;
DBusMessageIter iter, reply_iter;
double value;
DBusError _error;
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, -1.0);
+
message = dbus_message_new_method_call ("org.freedesktop.Hal", udi,
"org.freedesktop.Hal.Device",
"GetPropertyDouble");
@@ -1391,14 +1391,14 @@
libhal_device_get_property_bool (LibHalContext *ctx,
const char *udi, const char *key, DBusError *error)
{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
-
DBusMessage *message;
DBusMessage *reply;
DBusMessageIter iter, reply_iter;
dbus_bool_t value;
DBusError _error;
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
+
message = dbus_message_new_method_call ("org.freedesktop.Hal", udi,
"org.freedesktop.Hal.Device",
"GetPropertyBoolean");
@@ -1460,12 +1460,12 @@
dbus_bool_t bool_value,
DBusError *error)
{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
-
DBusMessage *message;
DBusMessage *reply;
DBusMessageIter iter;
char *method_name = NULL;
+
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
/** @todo sanity check incoming params */
switch (type) {
@@ -1688,12 +1688,12 @@
const char *value,
DBusError *error)
{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
-
DBusMessage *message;
DBusMessage *reply;
DBusMessageIter iter;
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
+
message = dbus_message_new_method_call ("org.freedesktop.Hal", udi,
"org.freedesktop.Hal.Device",
"StringListAppend");
@@ -1740,12 +1740,12 @@
const char *value,
DBusError *error)
{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
-
DBusMessage *message;
DBusMessage *reply;
DBusMessageIter iter;
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
+
message = dbus_message_new_method_call ("org.freedesktop.Hal", udi,
"org.freedesktop.Hal.Device",
"StringListPrepend");
@@ -1792,12 +1792,12 @@
unsigned int index,
DBusError *error)
{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
-
DBusMessage *message;
DBusMessage *reply;
DBusMessageIter iter;
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
+
message = dbus_message_new_method_call ("org.freedesktop.Hal", udi,
"org.freedesktop.Hal.Device",
"StringListRemoveIndex");
@@ -1843,12 +1843,12 @@
const char *key,
const char *value, DBusError *error)
{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
-
DBusMessage *message;
DBusMessage *reply;
DBusMessageIter iter;
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
+
message = dbus_message_new_method_call ("org.freedesktop.Hal", udi,
"org.freedesktop.Hal.Device",
"StringListRemove");
@@ -1897,12 +1897,12 @@
const char *reason_to_lock,
char **reason_why_locked, DBusError *error)
{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
-
DBusMessage *message;
DBusMessageIter iter;
DBusMessage *reply;
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
+
if (reason_why_locked != NULL)
*reason_why_locked = NULL;
@@ -1963,11 +1963,11 @@
libhal_device_unlock (LibHalContext *ctx,
const char *udi, DBusError *error)
{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
-
DBusMessage *message;
DBusMessage *reply;
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
+
message = dbus_message_new_method_call ("org.freedesktop.Hal",
udi,
"org.freedesktop.Hal.Device",
@@ -2017,14 +2017,14 @@
char *
libhal_new_device (LibHalContext *ctx, DBusError *error)
{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, NULL);
-
DBusMessage *message;
DBusMessage *reply;
DBusMessageIter reply_iter;
char *value;
char *dbus_str;
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, NULL);
+
message = dbus_message_new_method_call ("org.freedesktop.Hal",
"/org/freedesktop/Hal/Manager",
"org.freedesktop.Hal.Manager",
@@ -2100,12 +2100,12 @@
libhal_device_commit_to_gdl (LibHalContext *ctx,
const char *temp_udi, const char *udi, DBusError *error)
{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
-
DBusMessage *message;
DBusMessage *reply;
DBusMessageIter iter;
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
+
message = dbus_message_new_method_call ("org.freedesktop.Hal",
"/org/freedesktop/Hal/Manager",
"org.freedesktop.Hal.Manager",
@@ -2155,12 +2155,12 @@
dbus_bool_t
libhal_remove_device (LibHalContext *ctx, const char *udi, DBusError *error)
{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
-
DBusMessage *message;
DBusMessage *reply;
DBusMessageIter iter;
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
+
message = dbus_message_new_method_call ("org.freedesktop.Hal",
"/org/freedesktop/Hal/Manager",
"org.freedesktop.Hal.Manager",
@@ -2204,14 +2204,14 @@
dbus_bool_t
libhal_device_exists (LibHalContext *ctx, const char *udi, DBusError *error)
{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
-
DBusMessage *message;
DBusMessage *reply;
DBusMessageIter iter, reply_iter;
dbus_bool_t value;
DBusError _error;
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
+
message = dbus_message_new_method_call ("org.freedesktop.Hal",
"/org/freedesktop/Hal/Manager",
"org.freedesktop.Hal.Manager",
@@ -2273,14 +2273,14 @@
libhal_device_property_exists (LibHalContext *ctx,
const char *udi, const char *key, DBusError *error)
{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
-
DBusMessage *message;
DBusMessage *reply;
DBusMessageIter iter, reply_iter;
dbus_bool_t value;
DBusError _error;
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
+
message = dbus_message_new_method_call ("org.freedesktop.Hal", udi,
"org.freedesktop.Hal.Device",
"PropertyExists");
@@ -2340,12 +2340,12 @@
libhal_merge_properties (LibHalContext *ctx,
const char *target_udi, const char *source_udi, DBusError *error)
{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
-
DBusMessage *message;
DBusMessage *reply;
DBusMessageIter iter;
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
+
message = dbus_message_new_method_call ("org.freedesktop.Hal",
"/org/freedesktop/Hal/Manager",
"org.freedesktop.Hal.Manager",
@@ -2405,14 +2405,14 @@
const char *udi1, const char *udi2,
const char *property_namespace, DBusError *error)
{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
-
DBusMessage *message;
DBusMessage *reply;
DBusMessageIter iter, reply_iter;
dbus_bool_t value;
DBusError _error;
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
+
message = dbus_message_new_method_call ("org.freedesktop.Hal",
"/org/freedesktop/Hal/Manager",
"org.freedesktop.Hal.Manager",
@@ -2474,13 +2474,13 @@
dbus_bool_t
libhal_device_print (LibHalContext *ctx, const char *udi, DBusError *error)
{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
-
int type;
char *key;
LibHalPropertySet *pset;
LibHalPropertySetIterator i;
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
+
printf ("device_id = %s\n", udi);
if ((pset = libhal_device_get_all_properties (ctx, udi, error)) == NULL)
@@ -2559,14 +2559,14 @@
const char *key,
const char *value, int *num_devices, DBusError *error)
{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, NULL);
-
DBusMessage *message;
DBusMessage *reply;
DBusMessageIter iter, iter_array, reply_iter;
char **hal_device_names;
DBusError _error;
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, NULL);
+
message = dbus_message_new_method_call ("org.freedesktop.Hal",
"/org/freedesktop/Hal/Manager",
"org.freedesktop.Hal.Manager",
@@ -2629,12 +2629,12 @@
libhal_device_add_capability (LibHalContext *ctx,
const char *udi, const char *capability, DBusError *error)
{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
-
DBusMessage *message;
DBusMessage *reply;
DBusMessageIter iter;
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
+
message = dbus_message_new_method_call ("org.freedesktop.Hal", udi,
"org.freedesktop.Hal.Device",
"AddCapability");
@@ -2681,12 +2681,12 @@
dbus_bool_t
libhal_device_query_capability (LibHalContext *ctx, const char *udi, const char *capability, DBusError *error)
{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
-
char **caps;
unsigned int i;
dbus_bool_t ret;
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
+
ret = FALSE;
caps = libhal_device_get_property_strlist (ctx, udi, "info.capabilities", error);
@@ -2717,14 +2717,14 @@
libhal_find_device_by_capability (LibHalContext *ctx,
const char *capability, int *num_devices, DBusError *error)
{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, NULL);
-
DBusMessage *message;
DBusMessage *reply;
DBusMessageIter iter, iter_array, reply_iter;
char **hal_device_names;
DBusError _error;
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, NULL);
+
message = dbus_message_new_method_call ("org.freedesktop.Hal",
"/org/freedesktop/Hal/Manager",
"org.freedesktop.Hal.Manager",
@@ -2809,11 +2809,11 @@
*/
dbus_bool_t
libhal_device_add_property_watch (LibHalContext *ctx, const char *udi, DBusError *error)
-{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
-
+{
char buf[512];
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
+
snprintf (buf, 512,
"type='signal',"
"interface='org.freedesktop.Hal.Device',"
@@ -2837,11 +2837,11 @@
*/
dbus_bool_t
libhal_device_remove_property_watch (LibHalContext *ctx, const char *udi, DBusError *error)
-{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
-
+{
char buf[512];
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
+
snprintf (buf, 512,
"type='signal',"
"interface='org.freedesktop.Hal.Device',"
@@ -2935,11 +2935,11 @@
dbus_bool_t
libhal_ctx_init (LibHalContext *ctx, DBusError *error)
{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
-
DBusError _error;
dbus_bool_t hald_exists;
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
+
if (ctx->connection == NULL)
return FALSE;
@@ -3023,11 +3023,11 @@
*/
dbus_bool_t
libhal_ctx_shutdown (LibHalContext *ctx, DBusError *error)
-{
- LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
-
+{
DBusError myerror;
+ LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
+
if (ctx->is_direct) {
/* for some reason dbus_connection_set_exit_on_disconnect doesn't work yet so don't unref */
/*dbus_connection_unref (ctx->connection);*/
More information about the hal-commit
mailing list