More type issues/warnings

This commit is contained in:
TingPing 2015-02-21 21:01:14 -05:00
parent c36d4859d7
commit 7e7e87600e
2 changed files with 5 additions and 5 deletions

View File

@ -37,7 +37,7 @@ int xs_parse_df(gint64 *out_total, gint64 *out_free)
long long int avail, total;
/* Filesystem 1024-blocks Used Available Capacity Mounted-on */
if (sscanf (buffer, "%*s %lld %*lld %lld %*s %*s", &total, &avail) == 2)
if (sscanf (buffer, "%*s %lld %*s %lld %*s %*s", &total, &avail) == 2)
{
*out_total += total;
*out_free += avail;

View File

@ -116,7 +116,7 @@ gint64 xs_parse_uptime(void)
return 0;
if(fgets(buffer, bsize, fp) != NULL)
uptime = strtol(buffer, NULL, 0);
uptime = g_ascii_strtoll(buffer, NULL, 0);
fclose(fp);
@ -146,13 +146,13 @@ int xs_parse_sound(char *snd_card)
if(isdigit(buffer[0]) || isdigit(buffer[1]))
{
char card_buf[bsize];
long card_id = 0;
gint64 card_id = 0;
pos = strstr(buffer, ":");
card_id = strtoll(buffer, NULL, 0);
card_id = g_ascii_strtoll(buffer, NULL, 0);
if (card_id == 0)
g_snprintf(card_buf, bsize, "%s", pos+2);
else
g_snprintf(card_buf, bsize, "%ld: %s", card_id, pos+2);
g_snprintf(card_buf, bsize, "%"G_GINT64_FORMAT": %s", card_id, pos+2);
pos = strstr(card_buf, "\n");
*pos = '\0';
strcat(cards, card_buf);