hal/hald/linux2/probing probe-volume.c,1.29,1.30

[Danny Kukawka]

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

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

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



Index: probe-volume.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/probing/probe-volume.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- probe-volume.c	12 May 2006 15:17:05 -0000	1.29
+++ probe-volume.c	12 May 2006 16:43:44 -0000	1.30
@@ -66,7 +66,6 @@
 {
 	char *endchar;
 	char *newstr;
-	char *s;
 	unsigned int fixes;
 
 	if (str == NULL)
@@ -75,8 +74,7 @@
 	newstr = g_strdup (str);
 
 	fixes = 0;
-	s = newstr;
-	while (!g_utf8_validate (s, -1, (const char **) &endchar)) {
+	while (!g_utf8_validate (newstr, -1, (const char **) &endchar)) {
 		*endchar = '_';
 		++fixes;
 	}