Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-14 11:33:14 +00:00
Code Issues Releases Activity

use sscanf() instead of hextobyte()

Browse Source
This commit is contained in:
Nikolas Garofil 2011-02-12 18:01:41 +01:00
parent 723255f142
commit 678d79e6fe
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/linux.cc
View File

@ -347,21 +347,6 @@ void print_gateway_ip(struct text_object *obj, char *p, int p_max_size)
snprintf(p, p_max_size, "%s", gw_info.ip);
}
u_int8_t hextobyte(const char in[2]) {
u_int8_t out=0;
char currentchar;
for(int i=0; i<2; i++) {
currentchar=in[i];
if(currentchar <= '9') currentchar -= '0';
else if(currentchar <= 'A') currentchar -= 'A' - 10;
else currentchar -= 'a' - 10;
out<<=4;
out+=currentchar;
}
return out;
}
int update_net_stats(void)
{
FILE *net_dev_fp;
@ -606,7 +591,7 @@ int update_net_stats(void)
lastv6 = lastv6->next;
}
for(int i=0; i<16; i++)
lastv6->addr.s6_addr[i]=hextobyte(v6addr+2*i);
sscanf(v6addr+2*i, "%2x", (unsigned int*) &(lastv6->addr.s6_addr[i]));
lastv6->netmask = netmask;
switch(scope) {
case 0: //global