[Conky-commits] SF.net SVN: conky:[1274] trunk/conky1

[<n0...@us...>]

Revision: 1274
          http://conky.svn.sourceforge.net/conky/?rev=1274&view=rev
Author:   n0-1
Date:     2008-12-06 19:10:27 +0000 (Sat, 06 Dec 2008)

Log Message:
-----------
since DEV_NAME() is used when calling, this check is needless

Modified Paths:
--------------
    trunk/conky1/ChangeLog
    trunk/conky1/src/diskio.c

Modified: trunk/conky1/ChangeLog
===================================================================
--- trunk/conky1/ChangeLog	2008-11-30 20:53:20 UTC (rev 1273)
+++ trunk/conky1/ChangeLog	2008-12-06 19:10:27 UTC (rev 1274)
@@ -1,5 +1,8 @@
 # $Id$
 
+2008-12-06
+	* Removed duplicate sanity check for diskio
+
 2008-11-30
 	* Added runtime debugging output
 

Modified: trunk/conky1/src/diskio.c
===================================================================
--- trunk/conky1/src/diskio.c	2008-11-30 20:53:20 UTC (rev 1273)
+++ trunk/conky1/src/diskio.c	2008-12-06 19:10:27 UTC (rev 1274)
@@ -86,12 +86,8 @@
 		free(new->dev);
 		new->dev = 0;
 	}
-	if (strncmp(s, "/dev/", 5) == 0) {
-		// supplied a /dev/device arg, so cut off the /dev part
-		new->dev = strndup(s + 5, text_buffer_size);
-	} else {
-		new->dev = strndup(s, text_buffer_size);
-	}
+	new->dev = strndup(s, text_buffer_size);
+
 	/*
 	 * check that device actually exists
 	 */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.