hal/libhal libhal.c,1.54,1.55
David Zeuthen
david at freedesktop.org
Mon Aug 1 10:41:40 PDT 2005
Update of /cvs/hal/hal/libhal
In directory gabe:/tmp/cvs-serv1641/libhal
Modified Files:
libhal.c
Log Message:
2005-08-01 David Zeuthen <davidz at redhat.com>
Patch from Danny Kukawka <danny.kukawka at web.de>.
* libhal/libhal.c, hald/linux2/ids.c: This is a patch to fix usage
of #NULL within the doxygen code documentation (replaced through
'NULL' since '#NULL' generates a warning).
Index: libhal.c
===================================================================
RCS file: /cvs/hal/hal/libhal/libhal.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- libhal.c 21 Jul 2005 20:26:46 -0000 1.54
+++ libhal.c 1 Aug 2005 17:41:37 -0000 1.55
@@ -333,7 +333,7 @@
* @param ctx The context for the connection to hald
* @param udi Unique id of device
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return An object represent all properties. Must be
* freed with libhal_free_property_set
*/
@@ -905,7 +905,7 @@
* @param ctx The context for the connection to hald
* @param num_devices The number of devices will be stored here
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return An array of device identifiers terminated
* with NULL. It is the responsibility of the
* caller to free with libhal_free_string_array().
@@ -970,7 +970,7 @@
* @param udi Unique Device Id
* @param key Name of the property
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return One of LIBHAL_PROPERTY_TYPE_INT32,
* LIBHAL_PROPERTY_TYPE_UINT64, LIBHAL_PROPERTY_TYPE_DOUBLE,
* LIBHAL_PROPERTY_TYPE_BOOLEAN, LIBHAL_PROPERTY_TYPE_STRING,
@@ -1029,7 +1029,7 @@
* @param udi Unique Device Id
* @param key Name of the property
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return Array of pointers to UTF8 nul-terminated
* strings terminated by NULL. The caller is
* responsible for freeing this string
@@ -1100,7 +1100,7 @@
* @param udi Unique Device Id
* @param key Name of the property
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return UTF8 nul-terminated string. The caller is
* responsible for freeing this string with the
* function libhal_free_string().
@@ -1179,7 +1179,7 @@
* @param udi Unique Device Id
* @param key Name of the property
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return Property value (32-bit signed integer)
*/
dbus_int32_t
@@ -1248,7 +1248,7 @@
* @param udi Unique Device Id
* @param key Name of the property
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return Property value (64-bit unsigned integer)
*/
dbus_uint64_t
@@ -1316,7 +1316,7 @@
* @param udi Unique Device Id
* @param key Name of the property
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return Property value (IEEE754 double precision float)
*/
double
@@ -1384,7 +1384,7 @@
* @param udi Unique Device Id
* @param key Name of the property
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return Property value (boolean)
*/
dbus_bool_t
@@ -1548,7 +1548,7 @@
* @param key Name of the property
* @param value Value of the property; a UTF8 string
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return TRUE if the property was set, FALSE if
* the device didn't exist or the property
* had a different type.
@@ -1572,7 +1572,7 @@
* @param key Name of the property
* @param value Value of the property
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return TRUE if the property was set, FALSE if
* the device didn't exist or the property
* had a different type.
@@ -1593,7 +1593,7 @@
* @param key Name of the property
* @param value Value of the property
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return TRUE if the property was set, FALSE if
* the device didn't exist or the property
* had a different type.
@@ -1614,7 +1614,7 @@
* @param key Name of the property
* @param value Value of the property
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return TRUE if the property was set, FALSE if
* the device didn't exist or the property
* had a different type.
@@ -1635,7 +1635,7 @@
* @param key Name of the property
* @param value Value of the property
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return TRUE if the property was set, FALSE if
* the device didn't exist or the property
* had a different type.
@@ -1656,7 +1656,7 @@
* @param udi Unique Device Id
* @param key Name of the property
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return TRUE if the property was set, FALSE if
* the device didn't exist
*/
@@ -1676,7 +1676,7 @@
* @param key Name of the property
* @param value Value to append to property
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return TRUE if the value was appended, FALSE if
* the device didn't exist or the property
* had a different type.
@@ -1728,7 +1728,7 @@
* @param key Name of the property
* @param value Value to prepend to property
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return TRUE if the value was prepended, FALSE if
* the device didn't exist or the property
* had a different type.
@@ -1780,7 +1780,7 @@
* @param key Name of the property
* @param index Index of string to remove in the strlist
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return TRUE if the string was removed, FALSE if
* the device didn't exist or the property
* had a different type.
@@ -1832,7 +1832,7 @@
* @param key Name of the property
* @param value The string to search for and remove
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return TRUE if the string was removed, FALSE if
* the device didn't exist or the property
* had a different type.
@@ -1887,7 +1887,7 @@
* device cannot be locked on failure, or
* NULL
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return TRUE if the lock was obtained, FALSE
* otherwise
*/
@@ -1955,7 +1955,7 @@
* @param ctx The context for the connection to hald
* @param udi Unique Device Id
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return TRUE if the device was successfully unlocked,
* FALSE otherwise
*/
@@ -2009,7 +2009,7 @@
*
* @param ctx The context for the connection to hald
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return Temporary device unique id or NULL if there
* was a problem. This string must be freed
* by the caller.
@@ -2092,7 +2092,7 @@
* libhal_new_device()
* @param udi The new unique device id.
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return FALSE if the given unique device id is already
* in use.
*/
@@ -2149,7 +2149,7 @@
* @param ctx The context for the connection to hald
* @param udi The new unique device id.
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return TRUE if the device was removed, FALSE otherwise
*/
dbus_bool_t
@@ -2198,7 +2198,7 @@
* @param ctx The context for the connection to hald
* @param udi Unique device id.
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return TRUE if the device exists
*/
dbus_bool_t
@@ -2266,7 +2266,7 @@
* @param udi Unique device id.
* @param key Name of the property
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return TRUE if the device exists, FALSE otherwise
*/
dbus_bool_t
@@ -2333,7 +2333,7 @@
* @param target_udi Unique device id of target device to merge to
* @param source_udi Unique device id of device to merge from
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return TRUE if the properties were merged, FALSE otherwise
*/
dbus_bool_t
@@ -2394,7 +2394,7 @@
* @param udi2 Unique Device Id for device 2
* @param property_namespace Namespace for set of devices, e.g. "usb"
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return TRUE if all properties starting
* with the given namespace parameter
* from one device is in the other and
@@ -2467,7 +2467,7 @@
* @param ctx The context for the connection to hald
* @param udi Unique Device Id
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return TRUE if device's information could be obtained,
* FALSE otherwise
*/
@@ -2550,7 +2550,7 @@
* @param value Value to match
* @param num_devices Pointer to store number of devices
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return UDI of devices; free with
* libhal_free_string_array()
*/
@@ -2621,7 +2621,7 @@
* @param udi Unique Device Id
* @param capability Capability name
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return TRUE if the capability was added, FALSE if
* the device didn't exist
*/
@@ -2674,7 +2674,7 @@
* @param udi Unique Device Id
* @param capability Capability name
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return TRUE if the device has the capability,
* otherwise FALSE
*/
@@ -2709,7 +2709,7 @@
* @param capability Capability name
* @param num_devices Pointer to store number of devices
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return UDI of devices; free with
* libhal_free_string_array()
*/
@@ -2776,7 +2776,7 @@
*
* @param ctx The context for the connection to hald
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return TRUE only if the operation succeeded
*/
dbus_bool_t
@@ -2804,7 +2804,7 @@
* @param ctx The context for the connection to hald
* @param udi Unique Device Id
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return TRUE only if the operation succeeded
*/
dbus_bool_t
@@ -2832,7 +2832,7 @@
* @param ctx The context for the connection to hald
* @param udi Unique Device Id
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return TRUE only if the operation succeeded
*/
dbus_bool_t
@@ -2929,7 +2929,7 @@
* @param ctx Context for connection to hald (connection
* should be set with libhal_ctx_set_dbus_connection)
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return TRUE if initialization succeeds, FALSE otherwise
*/
dbus_bool_t
@@ -2977,7 +2977,7 @@
/** Create an already initialized connection to hald
*
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return A pointer to an already initialized LibHalContext
*/
LibHalContext *
@@ -3017,7 +3017,7 @@
*
* @param ctx Context for connection to hald
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return TRUE if connection successfully shut down,
* FALSE otherwise
*/
@@ -3290,7 +3290,7 @@
* @param condition_name User-readable name of condition
* @param condition_details User-readable details of condition
* @param error Pointer to an initialized dbus error object for
- * returning errors or #NULL
+ * returning errors or NULL
* @return TRUE if condition successfully emitted,
* FALSE otherwise
*/
More information about the hal-commit
mailing list