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

fix indenting in linux.c

Browse Source 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1048 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Phil 2008-03-24 20:43:55 +00:00
parent 749fb99edd
commit 3966025939
1 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/linux.c
View File

@ -327,7 +327,7 @@ inline void update_net_stats()
for (i2 = 0; i2 < 16; i2++) { for (i2 = 0; i2 < 16; i2++) {
struct net_stat *ns; struct net_stat *ns;
char *s, *p; char *s, *p;
char temp_addr[17]; char temp_addr[17];
long long r, t, last_recv, last_trans; long long r, t, last_recv, last_trans;
if (fgets(buf, 255, net_dev_fp) == NULL) { if (fgets(buf, 255, net_dev_fp) == NULL) {
@ -352,12 +352,12 @@ inline void update_net_stats()
ns = get_net_stat(s); ns = get_net_stat(s);
ns->up = 1; ns->up = 1;
memset(&(ns->addr.sa_data), 0, 14); memset(&(ns->addr.sa_data), 0, 14);
if(NULL == ns->addrs) if(NULL == ns->addrs)
ns->addrs = (char*) malloc(17 * 16); ns->addrs = (char*) malloc(17 * 16);
if(NULL != ns->addrs) if(NULL != ns->addrs)
memset(ns->addrs, 0, 17 * 16); /* Up to 17 chars per ip, max 16 interfaces. Nasty memory usage... */ memset(ns->addrs, 0, 17 * 16); /* Up to 17 chars per ip, max 16 interfaces. Nasty memory usage... */
last_recv = ns->recv; last_recv = ns->recv;
last_trans = ns->trans; last_trans = ns->trans;
@ -398,16 +398,15 @@ inline void update_net_stats()
ns = get_net_stat( ns = get_net_stat(
((struct ifreq *) conf.ifc_buf)[k].ifr_ifrn.ifrn_name); ((struct ifreq *) conf.ifc_buf)[k].ifr_ifrn.ifrn_name);
ns->addr = ((struct ifreq *) conf.ifc_buf)[k].ifr_ifru.ifru_addr; ns->addr = ((struct ifreq *) conf.ifc_buf)[k].ifr_ifru.ifru_addr;
if(NULL != ns->addrs) if(NULL != ns->addrs) {
{ sprintf(temp_addr, "%u.%u.%u.%u, ",
sprintf(temp_addr, "%u.%u.%u.%u, ", ns->addr.sa_data[2] & 255,
ns->addr.sa_data[2] & 255, ns->addr.sa_data[3] & 255,
ns->addr.sa_data[3] & 255, ns->addr.sa_data[4] & 255,
ns->addr.sa_data[4] & 255, ns->addr.sa_data[5] & 255);
ns->addr.sa_data[5] & 255); if(NULL == strstr(ns->addrs, temp_addr))
if(NULL == strstr(ns->addrs, temp_addr)) strncpy(ns->addrs + strlen(ns->addrs), temp_addr, 17);
strncpy(ns->addrs + strlen(ns->addrs), temp_addr, 17); }
}
} }
close((long) i); close((long) i);
@ -2423,18 +2422,18 @@ void update_entropy(void)
char *get_disk_protect_queue(char *disk) char *get_disk_protect_queue(char *disk)
{ {
FILE *fp; FILE *fp;
char path[128]; char path[128];
int state; int state;
snprintf(path, 127, "/sys/block/%s/queue/protect", disk); snprintf(path, 127, "/sys/block/%s/queue/protect", disk);
if ((fp = fopen(path, "r")) == NULL) if ((fp = fopen(path, "r")) == NULL)
return "n/a "; return "n/a ";
if (fscanf(fp, "%d\n", &state) != 1) { if (fscanf(fp, "%d\n", &state) != 1) {
fclose(fp); fclose(fp);
return "failed"; return "failed";
} }
fclose(fp); fclose(fp);
return state ? "frozen" : "free "; return state ? "frozen" : "free ";
} }