fix uninitialized pc->merge_type

This caused x86-64 to freak out, apparently it works fine on x86.

4 files changed, 154 insertions, 1 deletions

diff --git a/doc/api/tmpl/libhal-storage.sgml b/doc/api/tmpl/libhal-storage.sgml
index ab027a72..ae280397 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>
+
+@drive: 
+@Returns: 
+
+
 <!-- ##### FUNCTION libhal_drive_get_size ##### -->
 <para>
 
@@ -298,6 +307,15 @@ libhal-storage
 @Returns: 
 
 
+<!-- ##### FUNCTION libhal_drive_get_media_size ##### -->
+<para>
+
+</para>
+
+@drive: 
+@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: 
+@LIBHAL_VOLUME_USAGE_OTHER: 
 
 <!-- ##### ENUM LibHalVolumeDiscType ##### -->
 <para>
@@ -883,6 +902,24 @@ libhal-storage
 @Returns: 
 
 
+<!-- ##### FUNCTION libhal_volume_get_msdos_part_table_start ##### -->
+<para>
+
+</para>
+
+@volume: 
+@Returns: 
+
+
+<!-- ##### FUNCTION libhal_volume_get_msdos_part_table_size ##### -->
+<para>
+
+</para>
+
+@volume: 
+@Returns: 
+
+
 <!-- ##### FUNCTION libhal_volume_should_ignore ##### -->
 <para>
 
diff --git a/doc/api/tmpl/libhal.sgml b/doc/api/tmpl/libhal.sgml
index 8ec53edd..116a16b5 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>
+
+@udi: 
+@Returns: 
+
+
+<!-- ##### FUNCTION libhal_changeset_set_property_string ##### -->
+<para>
+
+</para>
+
+@changeset: 
+@key: 
+@value: 
+@Returns: 
+
+
+<!-- ##### FUNCTION libhal_changeset_set_property_int ##### -->
+<para>
+
+</para>
+
+@changeset: 
+@key: 
+@value: 
+@Returns: 
+
+
+<!-- ##### FUNCTION libhal_changeset_set_property_uint64 ##### -->
+<para>
+
+</para>
+
+@changeset: 
+@key: 
+@value: 
+@Returns: 
+
+
+<!-- ##### FUNCTION libhal_changeset_set_property_double ##### -->
+<para>
+
+</para>
+
+@changeset: 
+@key: 
+@value: 
+@Returns: 
+
+
+<!-- ##### FUNCTION libhal_changeset_set_property_bool ##### -->
+<para>
+
+</para>
+
+@changeset: 
+@key: 
+@value: 
+@Returns: 
+
+
+<!-- ##### FUNCTION libhal_changeset_set_property_strlist ##### -->
+<para>
+
+</para>
+
+@changeset: 
+@key: 
+@value: 
+@Returns: 
+
+
+<!-- ##### FUNCTION libhal_device_commit_changeset ##### -->
+<para>
+
+</para>
+
+@ctx: 
+@changeset: 
+@error: 
+@Returns: 
+
+
+<!-- ##### FUNCTION libhal_device_free_changeset ##### -->
+<para>
+
+</para>
+
+@changeset: 
+
+
 <!-- ##### STRUCT LibHalProperty_s ##### -->
 <para>
 
diff --git a/doc/api/tmpl/util.sgml b/doc/api/tmpl/util.sgml
index d7389951..d2e23210 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>
+
+@mount_point: 
+@Returns: 
+
+
diff --git a/hald/device_info.c b/hald/device_info.c
index 478c94a1..5803719a 100644
--- a/hald/device_info.c
+++ b/hald/device_info.c
@@ -779,7 +779,6 @@ handle_spawn (ParsingContext * pc, const char **attr)
 	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 *el, const char **attr)
 
 	pc->cdata_buf_len = 0;
 
+	pc->merge_type = MERGE_TYPE_UNKNOWN;
+
 /*
     for (i = 0; i < pc->depth; i++)
         printf("  ");