hal/hald/linux2/probing probe-volume.c,1.27,1.28

[Danny Kukawka]

Update of /cvs/hal/hal/hald/linux2/probing
In directory kemper:/tmp/cvs-serv22682/hald/linux2/probing

Modified Files:
	probe-volume.c 
Log Message:
2006-05-10  Danny Kukawka  <danny.kukawka at web.de>

        * hald/linux2/probing/probe-volume.c: (strdup_valid_utf8):
        removed unneeded code and validate the returned string directly.

        * hald/util.c: (hal_util_strdup_valid_utf8): validate the returned
        string and not the original, which we duplicated for return.



Index: probe-volume.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/probing/probe-volume.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- probe-volume.c	9 May 2006 20:34:38 -0000	1.27
+++ probe-volume.c	10 May 2006 12:28:32 -0000	1.28
@@ -66,14 +66,13 @@
 {
 	char *endchar;
 	char *newstr;
-	char *s;
 
 	if (str == NULL)
 		return NULL;
 
 	newstr = g_strdup (str);
-	s = newstr;
-	while (!g_utf8_validate (s, -1, (const char **) &endchar)) {
+
+	while (!g_utf8_validate (newstr, -1, (const char **) &endchar)) {
 		*endchar = '_';
 	}