Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-27 04:32:55 +00:00
Code Issues Releases Activity

Remove unused variables and rearrange includes.

Browse Source 
Signed-off-by: Brenden Matthews <brenden@rty.ca>
This commit is contained in:
Nikos Ntarmos 2009-05-15 01:39:54 +03:00 committed by Brenden Matthews
parent 38d4030e65
commit 0880c1722d
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/freebsd.c
View File

@ -24,6 +24,7 @@
* *
*/ */
#include <sys/ioctl.h>
#include <sys/dkstat.h> #include <sys/dkstat.h>
#include <sys/param.h> #include <sys/param.h>
#include <sys/resource.h> #include <sys/resource.h>
@ -32,7 +33,6 @@
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/vmmeter.h>
#include <sys/user.h> #include <sys/user.h>
#include <net/if.h> #include <net/if.h>
@ -395,8 +395,6 @@ static void get_battery_stats(int *battime, int *batcapacity, int *batstate, int
void get_battery_stuff(char *buf, unsigned int n, const char *bat, int item) void get_battery_stuff(char *buf, unsigned int n, const char *bat, int item)
{ {
int battime, batcapacity, batstate, ac; int battime, batcapacity, batstate, ac;
char battery_status[64];
char battery_time[64];
get_battery_stats(&battime, &batcapacity, &batstate, &ac); get_battery_stats(&battime, &batcapacity, &batstate, &ac);
@ -439,7 +437,7 @@ static int check_bat(const char *bat)
} }
if (!bat || (batnum = strtol(bat, &endptr, 10)) < 0 || if (!bat || (batnum = strtol(bat, &endptr, 10)) < 0 ||
bat == endptr || batnum > numbatts) { bat == endptr || batnum > numbatts) {
fprintf(stderr, "Wrong battery unit requested\n", bat); fprintf(stderr, "Wrong battery unit %s requested\n", bat ? bat : "");
return -1; return -1;
} }
return batnum; return batnum;
@ -448,7 +446,7 @@ static int check_bat(const char *bat)
int get_battery_perct(const char *bat) int get_battery_perct(const char *bat)
{ {
union acpi_battery_ioctl_arg battio; union acpi_battery_ioctl_arg battio;
int batnum, numbatts, acpifd; int batnum, acpifd;
int designcap, lastfulcap, batperct; int designcap, lastfulcap, batperct;
if ((battio.unit = batnum = check_bat(bat)) < 0) if ((battio.unit = batnum = check_bat(bat)) < 0)