snow/dockapps
1
0
Fork 0
Code Issues Releases Activity

wmifs: Reduce scopes of variables (fixes style warnings from cppcheck).

Browse source
This commit is contained in:
Doug Torrance 2015-05-27 17:33:27 -05:00 committed by Carlos R. Mafra
parent ea33cf06ce
commit 78ad4e4380
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
wmifs/wmifs.c
View file

@ -665,7 +665,6 @@ void DrawActiveIFS(char *real_name)
*/ */
size_t i; size_t i;
int c;
int k; int k;
size_t len; size_t len;
char name[256]; char name[256];
@ -685,6 +684,8 @@ void DrawActiveIFS(char *real_name)
k = 5; k = 5;
for (i = 0; name[i]; i++) { for (i = 0; name[i]; i++) {
int c;
if (i == strlen(name)-1 && strlen(name) <= 4 && name[strlen(name)-1] >= '0' && if (i == strlen(name)-1 && strlen(name) <= 4 && name[strlen(name)-1] >= '0' &&
name[strlen(name)-1] <= '9') { name[strlen(name)-1] <= '9') {
copyXPMArea(61, 64, 4, 9, k, 5); copyXPMArea(61, 64, 4, 9, k, 5);
@ -719,10 +720,11 @@ int get_statistics(char *devname, long *ip, long *op, long *is, long *os)
int i; int i;
int found; int found;
struct ppp_stats ppp_cur; struct ppp_stats ppp_cur;
static int ppp_opened;
if (!strncmp(devname, "ppp", 3)) { if (!strncmp(devname, "ppp", 3)) {
static int ppp_opened;
if (!ppp_opened) { if (!ppp_opened) {
/* Open the ppp device. */ /* Open the ppp device. */
memset(&ppp_cur, 0, sizeof(ppp_cur)); memset(&ppp_cur, 0, sizeof(ppp_cur));
@ -804,12 +806,13 @@ int stillonline(char *ifs)
{ {
FILE *fp; FILE *fp;
char temp[BUFFER_SIZE];
int i; int i;
i = 0; i = 0;
fp = fopen("/proc/net/route", "r"); fp = fopen("/proc/net/route", "r");
if (fp) { if (fp) {
char temp[BUFFER_SIZE];
while (fgets(temp, BUFFER_SIZE, fp)) { while (fgets(temp, BUFFER_SIZE, fp)) {
if (strstr(temp, ifs)) { if (strstr(temp, ifs)) {
i = 1; /* Line is alive */ i = 1; /* Line is alive */
@ -829,12 +832,9 @@ int checknetdevs(void)
{ {
FILE *fd; FILE *fd;
char temp[BUFFER_SIZE];
char *p;
int i = 0, j; int i = 0, j;
int k; int k;
int devsfound = 0; int devsfound = 0;
char *tokens = " :\t\n";
char foundbuffer[MAX_STAT_DEVICES][8]; char foundbuffer[MAX_STAT_DEVICES][8];
for (i = 0; i < MAX_STAT_DEVICES; i++) for (i = 0; i < MAX_STAT_DEVICES; i++)
@ -844,6 +844,8 @@ int checknetdevs(void)
fd = fopen("/proc/net/dev", "r"); fd = fopen("/proc/net/dev", "r");
if (fd) { if (fd) {
char temp[BUFFER_SIZE];
/* Skip the first 2 lines */ /* Skip the first 2 lines */
if (!fgets(temp, BUFFER_SIZE, fd)) { if (!fgets(temp, BUFFER_SIZE, fd)) {
fclose(fd); fclose(fd);
@ -854,6 +856,9 @@ int checknetdevs(void)
return -1; return -1;
} }
while (fgets(temp, BUFFER_SIZE, fd)) { while (fgets(temp, BUFFER_SIZE, fd)) {
char *p;
char *tokens = " :\t\n";
p = strtok(temp, tokens); p = strtok(temp, tokens);
if (p == NULL) { if (p == NULL) {
printf("Barfed on: %s", temp); printf("Barfed on: %s", temp);
@ -948,7 +953,7 @@ void DrawStats(int *his, int num, int size, int x_left, int y_bottom)
int pixels_per_byte; int pixels_per_byte;
int j, k; int j, k;
int *p; int *p;
int p0, p1, p2, p3; int p2, p3;
pixels_per_byte = size; pixels_per_byte = size;
p = his; p = his;
@ -962,6 +967,8 @@ void DrawStats(int *his, int num, int size, int x_left, int y_bottom)
p = his; p = his;
for (k = 0; k < num; k++) { for (k = 0; k < num; k++) {
int p0, p1;
p0 = p[0]; p0 = p[0];
p1 = p[1]; p1 = p[1];