cleanup iface.c (thanks M. Dolze)

clients/lcdproc/util.c

@@ -9,18 +9,18 @@
 *  modify it under the terms of the GNU General Public License
 *  as published by the Free Software Foundation; either version 2
 *  of the License, or (at your option) any later version.
-* 
+*
 *  This program is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
-* 
+*
 *  You should have received a copy of the GNU General Public License
 *  along with this program; if not, write to the Free Software
 *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 *
 *  ---
-* 
+*
 *  $Source$
 *  $Revision$
 *  Checked in by: $Author$
@@ -35,25 +35,16 @@ char *
 sprintf_memory(char *dst, double value, double roundlimit)
 {
 	if (dst != NULL) {
-		static char *units[] = { "", "k", "M", "G", "T", "P", "E", "Z", "Y", NULL };
-		int offs = 0;
 		char *format = "%.1f%s";
 
-		if ((roundlimit <= 0.0) || (roundlimit > 1.0))
-			roundlimit = 0.5;
+		char *unit = convert_double(&value, 1024, roundlimit);
 
-		while (units[offs] != NULL) {
-			if (value <= 1024 * roundlimit)
-				break;
-			offs++;
-			value /= 1024;
-		}
 		if (value < 100)
 			format = "%.2f%s";
 		if (value < 10)
 			format = "%.3f%s";
 
-		sprintf(dst, format, value, units[offs]);
+		sprintf(dst, format, value, unit);
 	}	
 	return dst;	
 }
@@ -72,4 +63,31 @@ sprintf_percent(char *dst, double percent)
 	return dst;
 }
 
+/** converts a value with unit value
+ * does not do formatting
+ * base : should be 1000 for decimal and 1024 for binary units
+ * roundlimit : set < 1.0 if precision of original input value is not sufficient
+ */
+char *
+convert_double(double *value, int base, double roundlimit)
+{
+	static char *units[] = { "", "k", "M", "G", "T", "P", "E", "Z", "Y", NULL };
+	int off = 0;
+
+	if ((roundlimit <= 0.0) || (roundlimit > 1.0))
+		roundlimit = 0.5;
+
+	/* Get value's order of magnitude */
+	while (units[off] != NULL) {
+		/* Note: the check for 1000 is to idenfity the number of
+		 * characters in the output needed, not to decide if to scale value.
+		 */
+		if (*value < 1000 * roundlimit)
+			break;
+		off++;
+		*value /= base;
+	}
+	return units[off];	
+}
+
 /* EOF */