hal: Branch 'master'

[David Zeuthen]

 doc/api/tmpl/libhal-storage.sgml |   37 +++++++++++++
 doc/api/tmpl/libhal.sgml         |  106 +++++++++++++++++++++++++++++++++++++++
 doc/api/tmpl/util.sgml           |    9 +++
 hald/device_info.c               |    3 -
 4 files changed, 154 insertions(+), 1 deletion(-)

New commits:
diff-tree be78af22b72006a2209fb09f077a7421b5c637ab (from 1fe97744e639895b4342a1e7c9a22ac8a9920f43)
Author: David Zeuthen <davidz at redhat.com>
Date:   Wed Aug 23 21:11:04 2006 -0400

    fix uninitialized pc->merge_type
    
    This caused x86-64 to freak out, apparently it works fine on x86.

diff --git a/doc/api/tmpl/libhal-storage.sgml b/doc/api/tmpl/libhal-storage.sgml
index ab027a7..ae28039 100644
--- a/doc/api/tmpl/libhal-storage.sgml
+++ b/doc/api/tmpl/libhal-storage.sgml
@@ -289,6 +289,15 @@ libhal-storage
 @Returns: 
 
 
+<!-- ##### FUNCTION libhal_drive_is_media_detected ##### -->
+<para>
+
+</para>
+
+ at drive: 
+ at Returns: 
+
+
 <!-- ##### FUNCTION libhal_drive_get_size ##### -->
 <para>
 
@@ -298,6 +307,15 @@ libhal-storage
 @Returns: 
 
 
+<!-- ##### FUNCTION libhal_drive_get_media_size ##### -->
+<para>
+
+</para>
+
+ at drive: 
+ at Returns: 
+
+
 <!-- ##### FUNCTION libhal_drive_no_partitions_hint ##### -->
 <para>
 
@@ -570,6 +588,7 @@ libhal-storage
 @LIBHAL_VOLUME_USAGE_RAID_MEMBER: 
 @LIBHAL_VOLUME_USAGE_CRYPTO: 
 @LIBHAL_VOLUME_USAGE_UNKNOWN: 
+ at LIBHAL_VOLUME_USAGE_OTHER: 
 
 <!-- ##### ENUM LibHalVolumeDiscType ##### -->
 <para>
@@ -883,6 +902,24 @@ libhal-storage
 @Returns: 
 
 
+<!-- ##### FUNCTION libhal_volume_get_msdos_part_table_start ##### -->
+<para>
+
+</para>
+
+ at volume: 
+ at Returns: 
+
+
+<!-- ##### FUNCTION libhal_volume_get_msdos_part_table_size ##### -->
+<para>
+
+</para>
+
+ at volume: 
+ at Returns: 
+
+
 <!-- ##### FUNCTION libhal_volume_should_ignore ##### -->
 <para>
 
diff --git a/doc/api/tmpl/libhal.sgml b/doc/api/tmpl/libhal.sgml
index 8ec53ed..116a16b 100644
--- a/doc/api/tmpl/libhal.sgml
+++ b/doc/api/tmpl/libhal.sgml
@@ -535,6 +535,112 @@ libhal
 @Returns: 
 
 
+<!-- ##### STRUCT LibHalChangeSet_s ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### TYPEDEF LibHalChangeSet ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION libhal_device_new_changeset ##### -->
+<para>
+
+</para>
+
+ at udi: 
+ at Returns: 
+
+
+<!-- ##### FUNCTION libhal_changeset_set_property_string ##### -->
+<para>
+
+</para>
+
+ at changeset: 
+ at key: 
+ at value: 
+ at Returns: 
+
+
+<!-- ##### FUNCTION libhal_changeset_set_property_int ##### -->
+<para>
+
+</para>
+
+ at changeset: 
+ at key: 
+ at value: 
+ at Returns: 
+
+
+<!-- ##### FUNCTION libhal_changeset_set_property_uint64 ##### -->
+<para>
+
+</para>
+
+ at changeset: 
+ at key: 
+ at value: 
+ at Returns: 
+
+
+<!-- ##### FUNCTION libhal_changeset_set_property_double ##### -->
+<para>
+
+</para>
+
+ at changeset: 
+ at key: 
+ at value: 
+ at Returns: 
+
+
+<!-- ##### FUNCTION libhal_changeset_set_property_bool ##### -->
+<para>
+
+</para>
+
+ at changeset: 
+ at key: 
+ at value: 
+ at Returns: 
+
+
+<!-- ##### FUNCTION libhal_changeset_set_property_strlist ##### -->
+<para>
+
+</para>
+
+ at changeset: 
+ at key: 
+ at value: 
+ at Returns: 
+
+
+<!-- ##### FUNCTION libhal_device_commit_changeset ##### -->
+<para>
+
+</para>
+
+ at ctx: 
+ at changeset: 
+ at error: 
+ at Returns: 
+
+
+<!-- ##### FUNCTION libhal_device_free_changeset ##### -->
+<para>
+
+</para>
+
+ at changeset: 
+
+
 <!-- ##### STRUCT LibHalProperty_s ##### -->
 <para>
 
diff --git a/doc/api/tmpl/util.sgml b/doc/api/tmpl/util.sgml
index d738995..d2e2321 100644
--- a/doc/api/tmpl/util.sgml
+++ b/doc/api/tmpl/util.sgml
@@ -380,3 +380,12 @@ util
 @size: 
 
 
+<!-- ##### FUNCTION hal_util_is_mounted_by_hald ##### -->
+<para>
+
+</para>
+
+ at mount_point: 
+ at Returns: 
+
+
diff --git a/hald/device_info.c b/hald/device_info.c
index 478c94a..5803719 100644
--- a/hald/device_info.c
+++ b/hald/device_info.c
@@ -779,7 +779,6 @@ handle_spawn (ParsingContext * pc, const
 	strncpy (pc->merge_key, attr[1], MAX_KEY_SIZE);
 
 	pc->merge_type = MERGE_TYPE_SPAWN;
-
 	return;
 }
 
@@ -884,6 +883,8 @@ start (ParsingContext * pc, const char *
 
 	pc->cdata_buf_len = 0;
 
+	pc->merge_type = MERGE_TYPE_UNKNOWN;
+
 /*
     for (i = 0; i < pc->depth; i++)
         printf("  ");