hal: Branch 'master' - 2 commits

[Joe Marcus Clarke]

 hald/freebsd/hf-devtree.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c1d03e42248b21d1f9cc63cf9cffee2e2f89c2c3
Merge: 730cf64... 9cece37...
Author: Joe Marcus Clarke <marcus at FreeBSD.org>
Date:   Sat Feb 16 00:16:01 2008 -0500

    Merge branch 'master' of ssh://marcus@git.freedesktop.org/git/hal

commit 730cf64a7304a89bb69d44df73c9db7113b3181c
Author: Joe Marcus Clarke <marcus at FreeBSD.org>
Date:   Sat Feb 16 00:15:45 2008 -0500

    avoid code duplication
    
    Reuse an allocated variable instead of duplicating the code used to create
    it.

diff --git a/hald/freebsd/hf-devtree.c b/hald/freebsd/hf-devtree.c
index 6924bb4..01203f0 100644
--- a/hald/freebsd/hf-devtree.c
+++ b/hald/freebsd/hf-devtree.c
@@ -530,7 +530,7 @@ hf_devtree_device_set_info (HalDevice *device, const char *driver, int unit)
 
   devfile = g_strdup_printf("/dev/%s%i", driver, unit);
   if (g_file_test(devfile, G_FILE_TEST_EXISTS))
-    hf_device_property_set_string_printf(device, "freebsd.device_file", "/dev/%s%i", driver, unit);
+    hf_device_property_set_string_printf(device, "freebsd.device_file", devfile);
   g_free(devfile);
 }