hal: Branch 'master'

[Danny Kukawka]

 hald/linux2/probing/probe-storage.c |    2 +-
 hald/linux2/probing/probe-volume.c  |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
diff-tree 2f30228bd76dbddedd62486386d56e46e3b7cc54 (from 9f92b65ab9398476afc53e70a2173de53f2b4495)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Aug 21 20:38:16 2006 +0200

    fix overseen left dbg() calls in probe-{storage,volume}.c
    
    Replaced left dbg() calls in probe-storage.c and probe-volume.c
    with HAL_DEBUG().

diff --git a/hald/linux2/probing/probe-storage.c b/hald/linux2/probing/probe-storage.c
index 1847fcb..ed5f010 100644
--- a/hald/linux2/probing/probe-storage.c
+++ b/hald/linux2/probing/probe-storage.c
@@ -333,7 +333,7 @@ main (int argc, char *argv[])
 			ret = 2;
 			libhal_device_set_property_bool (ctx, udi, "storage.removable.media_available", TRUE, &error);
 			if (ioctl (fd, BLKGETSIZE64, &size) == 0) {
-				dbg ("media size = %llu", size);
+				HAL_DEBUG (("media size = %llu", size));
 				libhal_device_set_property_uint64 (ctx, udi, "storage.removable.media_size", size, &error);
 			}
 		} else {
diff --git a/hald/linux2/probing/probe-volume.c b/hald/linux2/probing/probe-volume.c
index 318ee46..8a57e52 100644
--- a/hald/linux2/probing/probe-volume.c
+++ b/hald/linux2/probing/probe-volume.c
@@ -166,7 +166,7 @@ probe_msdos_part_table(int fd)
 		partition_id_index[i].part_type = part[i].sys_ind;
 		partition_id_index[i].start = poff;
 		partition_id_index[i].size = plen;
-		dbg ("part %d -> type=%d off=%lld size=%lld", i, part[i].sys_ind, poff, plen);
+		HAL_DEBUG (("part %d -> type=%d off=%lld size=%lld", i, part[i].sys_ind, poff, plen));
 
 		if (is_extended(part[i].sys_ind)) {
 			HAL_DEBUG (("found extended partition at 0x%llx", (unsigned long long) poff));
@@ -714,15 +714,15 @@ main (int argc, char *argv[])
 			if (vid->usage_id == VOLUME_ID_UNUSED) {
 				unsigned char buf[2];
 
-				dbg ("looking whether partition is an extended msdos partition table", vid->usage_id);
+				HAL_DEBUG (("looking whether partition is an extended msdos partition table", vid->usage_id));
 
 				/* TODO: Is it good enough to just look for this magic? Kay? */
 				lseek (fd, MSDOS_SIG_OFF, SEEK_SET);
 				if (read (fd, &buf, 2) != 2) {
-					dbg ("read failed (%s)", strerror (errno));
+					HAL_DEBUG (("read failed (%s)", strerror (errno)));
 				} else {
 					if (memcmp (buf, MSDOS_MAGIC, 2) == 0) {
-						dbg ("partition is an extended msdos partition table");
+						HAL_DEBUG (("partition is an extended msdos partition table"));
 
 						libhal_changeset_set_property_string (changeset, "volume.fsusage", "partitiontable");
 						libhal_changeset_set_property_string (changeset, "volume.fstype", "msdos_extended_partitiontable");