hal: Branch 'master'

[David Zeuthen]

 hald/linux/blockdev.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree 523d7190fb6c2261dc8b16301008d5581cb7fdcc (from c53f3e46e53204bb1d1910b7fbbd81edaf61c29b)
Author: David Zeuthen <davidz at redhat.com>
Date:   Sun May 6 22:25:39 2007 -0400

    use correct integer size

diff --git a/hald/linux/blockdev.c b/hald/linux/blockdev.c
index b9ad9f1..e2f9574 100644
--- a/hald/linux/blockdev.c
+++ b/hald/linux/blockdev.c
@@ -712,9 +712,9 @@ refresh_md_state (HalDevice *d)
                 if ((str_completed = hal_util_get_string_from_file (sysfs_path, "md/sync_completed")) == NULL) {
                         HAL_WARNING (("Cannot get sync_completed for %s", sysfs_path));
                 } else {
-                        dbus_uint64_t sync_pos, sync_total;
+                        long long int sync_pos, sync_total;
 
-                        if (sscanf (str_completed, "%ld / %ld", &sync_pos, &sync_total) != 2) {
+                        if (sscanf (str_completed, "%lld / %lld", &sync_pos, &sync_total) != 2) {
                                 HAL_WARNING (("Malformed sync_completed '%s'", str_completed));
                         } else {
                                 double sync_progress;