From 84ec66c7cec3f9c3a11777caa233f2b81952905a Mon Sep 17 00:00:00 2001
From: Maarten ter Huurne <maarten@treewalker.org>
Date: Fri, 23 Sep 2011 01:23:53 +0200
Subject: [PATCH] Minor cleanup: better usage of fscanf.

Instead of having fscanf() read into a string buffer (with the risk of
overflowing it if sysfs returns an unexpectedly long string) and converting
the value to integer with atoi() afterwards, just use fscanf() to read
an integer.
---
 src/gmenu2x.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/gmenu2x.cpp b/src/gmenu2x.cpp
index 530563a..e3433a6 100644
--- a/src/gmenu2x.cpp
+++ b/src/gmenu2x.cpp
@@ -2017,10 +2017,8 @@ unsigned short GMenu2X::getBatteryLevel() {
 #else
 	if (!batteryHandle) return 0;
 	int battval = 0;
-	char battvalcstr[5];
-	fscanf(batteryHandle, "%s", &battvalcstr[0]);
+	fscanf(batteryHandle, "%d", &battval);
 	rewind(batteryHandle);
-	battval = atoi(battvalcstr);
 	if (battval>90) return 5;
 	if (battval>70) return 4;
 	if (battval>50) return 3;
@@ -2029,10 +2027,8 @@ unsigned short GMenu2X::getBatteryLevel() {
 
 	if (!usbHandle) return 0;
 	int usbval = 0;
-	char usbvalcstr[5];
-	fscanf(usbHandle, "%s", &usbvalcstr[0]);
+	fscanf(usbHandle, "%d", &usbval);
 	rewind(usbHandle);
-	usbval = atoi(usbvalcstr);
 	if (usbval==1) return 6;
 
 	return 0;