mirror of
https://github.com/Llewellynvdm/conky.git
synced 2025-01-11 10:38:12 +00:00
rename all shadowing variables for -Wshadow
* sadly intuitive names like "time" or "index" are already globally defined (functions in time.h and string.h) git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1070 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Phil
parent
a16a96911a
commit
ab63c2b024
56
src/conky.c
56
src/conky.c
@ -4009,10 +4009,10 @@ static void extract_variable_text(const char *p)
|
||||
free(list);
|
||||
}
|
||||
|
||||
struct text_object_list *parse_conky_vars(char *text, char *p, struct information *cur)
|
||||
struct text_object_list *parse_conky_vars(char *txt, char *p, struct information *cur)
|
||||
{
|
||||
struct text_object_list *object_list =
|
||||
extract_variable_text_internal(text);
|
||||
extract_variable_text_internal(txt);
|
||||
|
||||
generate_text_internal(p, max_user_text, object_list->text_objects,
|
||||
object_list->text_object_count, cur);
|
||||
@ -4100,14 +4100,14 @@ static void tail_pipe(struct text_object *obj, char *dst, size_t dst_size)
|
||||
snprintf(dst, dst_size, "%s", obj->data.tail.buffer);
|
||||
}
|
||||
|
||||
char *format_time(unsigned long time, const int width)
|
||||
char *format_time(unsigned long timeval, const int width)
|
||||
{
|
||||
char buf[10];
|
||||
unsigned long nt; // narrow time, for speed on 32-bit
|
||||
unsigned cc; // centiseconds
|
||||
unsigned nn; // multi-purpose whatever
|
||||
|
||||
nt = time;
|
||||
nt = timeval;
|
||||
cc = nt % 100; // centiseconds past second
|
||||
nt /= 100; // total seconds
|
||||
nn = nt % 60; // seconds past the minute
|
||||
@ -5836,7 +5836,7 @@ static void generate_text_internal(char *p, int p_max_size,
|
||||
#endif
|
||||
OBJ(top) {
|
||||
if (obj->data.top.num >= 0 && obj->data.top.num < 10) {
|
||||
char *time;
|
||||
char *timeval;
|
||||
|
||||
switch (obj->data.top.type) {
|
||||
case TOP_NAME:
|
||||
@ -5856,10 +5856,10 @@ static void generate_text_internal(char *p, int p_max_size,
|
||||
cur->cpu[obj->data.top.num]->totalmem);
|
||||
break;
|
||||
case TOP_TIME:
|
||||
time = format_time(
|
||||
timeval = format_time(
|
||||
cur->cpu[obj->data.top.num]->total_cpu_time, 9);
|
||||
snprintf(p, 10, "%9s", time);
|
||||
free(time);
|
||||
snprintf(p, 10, "%9s", timeval);
|
||||
free(timeval);
|
||||
break;
|
||||
default:
|
||||
ERR("Unhandled top data type: %d\n",
|
||||
@ -5871,7 +5871,7 @@ static void generate_text_internal(char *p, int p_max_size,
|
||||
}
|
||||
OBJ(top_mem) {
|
||||
if (obj->data.top.num >= 0 && obj->data.top.num < 10) {
|
||||
char *time;
|
||||
char *timeval;
|
||||
|
||||
switch (obj->data.top.type) {
|
||||
case TOP_NAME:
|
||||
@ -5891,11 +5891,11 @@ static void generate_text_internal(char *p, int p_max_size,
|
||||
cur->memu[obj->data.top.num]->totalmem);
|
||||
break;
|
||||
case TOP_TIME:
|
||||
time = format_time(
|
||||
timeval = format_time(
|
||||
cur->memu[obj->data.top.num]->total_cpu_time,
|
||||
9);
|
||||
snprintf(p, 10, "%9s", time);
|
||||
free(time);
|
||||
snprintf(p, 10, "%9s", timeval);
|
||||
free(timeval);
|
||||
break;
|
||||
default:
|
||||
ERR("Unhandled top data type: %d\n",
|
||||
@ -6193,12 +6193,12 @@ static void generate_text(void)
|
||||
global_text_object_count, cur);
|
||||
|
||||
if (stuff_in_upper_case) {
|
||||
char *p;
|
||||
char *tmp_p;
|
||||
|
||||
p = text_buffer;
|
||||
while (*p) {
|
||||
*p = toupper(*p);
|
||||
p++;
|
||||
tmp_p = text_buffer;
|
||||
while (*tmp_p) {
|
||||
*tmp_p = toupper(*tmp_p);
|
||||
tmp_p++;
|
||||
}
|
||||
}
|
||||
|
||||
@ -6239,7 +6239,7 @@ static inline int get_string_width_special(char *s)
|
||||
{
|
||||
#ifdef X11
|
||||
char *p, *final;
|
||||
int index = 1;
|
||||
int idx = 1;
|
||||
int width = 0;
|
||||
unsigned int i;
|
||||
|
||||
@ -6257,11 +6257,11 @@ static inline int get_string_width_special(char *s)
|
||||
for (i = 0; i < strlen(p); i++) {
|
||||
*(p + i) = *(p + i + 1);
|
||||
}
|
||||
if (specials[special_index + index].type == GRAPH
|
||||
|| specials[special_index + index].type == BAR) {
|
||||
width += specials[special_index + index].width;
|
||||
if (specials[special_index + idx].type == GRAPH
|
||||
|| specials[special_index + idx].type == BAR) {
|
||||
width += specials[special_index + idx].width;
|
||||
}
|
||||
index++;
|
||||
idx++;
|
||||
} else {
|
||||
p++;
|
||||
}
|
||||
@ -6715,9 +6715,9 @@ static void draw_line(char *s)
|
||||
case STIPPLED_HR:
|
||||
{
|
||||
int h = specials[special_index].height;
|
||||
int s = specials[special_index].arg;
|
||||
int tmp_s = specials[special_index].arg;
|
||||
int mid = font_ascent() / 2;
|
||||
char ss[2] = { s, s };
|
||||
char ss[2] = { tmp_s, tmp_s };
|
||||
|
||||
w = text_start_x + text_width - cur_x - 1;
|
||||
XSetLineAttributes(display, window.gc, h, LineOnOffDash,
|
||||
@ -8138,15 +8138,15 @@ static void load_config_file(const char *f)
|
||||
#endif /* X11 */
|
||||
CONF("mail_spool") {
|
||||
if (value) {
|
||||
char buf[256];
|
||||
char buffer[256];
|
||||
|
||||
variable_substitute(value, buf, 256);
|
||||
variable_substitute(value, buffer, 256);
|
||||
|
||||
if (buf[0] != '\0') {
|
||||
if (buffer[0] != '\0') {
|
||||
if (current_mail_spool) {
|
||||
free(current_mail_spool);
|
||||
}
|
||||
current_mail_spool = strdup(buf);
|
||||
current_mail_spool = strdup(buffer);
|
||||
}
|
||||
} else {
|
||||
CONF_ERR;
|
||||
|
||||
126
src/linux.c
126
src/linux.c
@ -390,22 +390,22 @@ inline void update_net_stats(void)
|
||||
ioctl((long) i, SIOCGIFCONF, &conf);
|
||||
|
||||
for (k = 0; k < conf.ifc_len / sizeof(struct ifreq); k++) {
|
||||
struct net_stat *ns;
|
||||
struct net_stat *ns2;
|
||||
|
||||
if (!(((struct ifreq *) conf.ifc_buf) + k))
|
||||
break;
|
||||
|
||||
ns = get_net_stat(
|
||||
ns2 = get_net_stat(
|
||||
((struct ifreq *) conf.ifc_buf)[k].ifr_ifrn.ifrn_name);
|
||||
ns->addr = ((struct ifreq *) conf.ifc_buf)[k].ifr_ifru.ifru_addr;
|
||||
if(NULL != ns->addrs) {
|
||||
ns2->addr = ((struct ifreq *) conf.ifc_buf)[k].ifr_ifru.ifru_addr;
|
||||
if(NULL != ns2->addrs) {
|
||||
sprintf(temp_addr, "%u.%u.%u.%u, ",
|
||||
ns->addr.sa_data[2] & 255,
|
||||
ns->addr.sa_data[3] & 255,
|
||||
ns->addr.sa_data[4] & 255,
|
||||
ns->addr.sa_data[5] & 255);
|
||||
if(NULL == strstr(ns->addrs, temp_addr))
|
||||
strncpy(ns->addrs + strlen(ns->addrs), temp_addr, 17);
|
||||
ns2->addr.sa_data[2] & 255,
|
||||
ns2->addr.sa_data[3] & 255,
|
||||
ns2->addr.sa_data[4] & 255,
|
||||
ns2->addr.sa_data[5] & 255);
|
||||
if(NULL == strstr(ns2->addrs, temp_addr))
|
||||
strncpy(ns2->addrs + strlen(ns2->addrs), temp_addr, 17);
|
||||
}
|
||||
}
|
||||
|
||||
@ -608,7 +608,7 @@ inline static void update_stat(void)
|
||||
static struct cpu_info *cpu = NULL;
|
||||
char buf[256];
|
||||
unsigned int i;
|
||||
unsigned int index;
|
||||
unsigned int idx;
|
||||
double curtmp;
|
||||
const char *stat_template = NULL;
|
||||
unsigned int malloc_cpu_size = 0;
|
||||
@ -638,7 +638,7 @@ inline static void update_stat(void)
|
||||
return;
|
||||
}
|
||||
|
||||
index = 0;
|
||||
idx = 0;
|
||||
while (!feof(stat_fp)) {
|
||||
if (fgets(buf, 255, stat_fp) == NULL) {
|
||||
break;
|
||||
@ -649,20 +649,20 @@ inline static void update_stat(void)
|
||||
info.mask |= (1 << INFO_RUN_PROCS);
|
||||
} else if (strncmp(buf, "cpu", 3) == 0) {
|
||||
double delta;
|
||||
index = isdigit(buf[3]) ? ((int) buf[3]) - 0x2F : 0;
|
||||
sscanf(buf, stat_template, &(cpu[index].cpu_user),
|
||||
&(cpu[index].cpu_nice), &(cpu[index].cpu_system),
|
||||
&(cpu[index].cpu_idle), &(cpu[index].cpu_iowait),
|
||||
&(cpu[index].cpu_irq), &(cpu[index].cpu_softirq),
|
||||
&(cpu[index].cpu_steal));
|
||||
idx = isdigit(buf[3]) ? ((int) buf[3]) - 0x2F : 0;
|
||||
sscanf(buf, stat_template, &(cpu[idx].cpu_user),
|
||||
&(cpu[idx].cpu_nice), &(cpu[idx].cpu_system),
|
||||
&(cpu[idx].cpu_idle), &(cpu[idx].cpu_iowait),
|
||||
&(cpu[idx].cpu_irq), &(cpu[idx].cpu_softirq),
|
||||
&(cpu[idx].cpu_steal));
|
||||
|
||||
cpu[index].cpu_total = cpu[index].cpu_user + cpu[index].cpu_nice +
|
||||
cpu[index].cpu_system + cpu[index].cpu_idle +
|
||||
cpu[index].cpu_iowait + cpu[index].cpu_irq +
|
||||
cpu[index].cpu_softirq + cpu[index].cpu_steal;
|
||||
cpu[idx].cpu_total = cpu[idx].cpu_user + cpu[idx].cpu_nice +
|
||||
cpu[idx].cpu_system + cpu[idx].cpu_idle +
|
||||
cpu[idx].cpu_iowait + cpu[idx].cpu_irq +
|
||||
cpu[idx].cpu_softirq + cpu[idx].cpu_steal;
|
||||
|
||||
cpu[index].cpu_active_total = cpu[index].cpu_total -
|
||||
(cpu[index].cpu_idle + cpu[index].cpu_iowait);
|
||||
cpu[idx].cpu_active_total = cpu[idx].cpu_total -
|
||||
(cpu[idx].cpu_idle + cpu[idx].cpu_iowait);
|
||||
info.mask |= (1 << INFO_CPU);
|
||||
|
||||
delta = current_update_time - last_update_time;
|
||||
@ -671,29 +671,29 @@ inline static void update_stat(void)
|
||||
break;
|
||||
}
|
||||
|
||||
cpu[index].cpu_val[0] = (cpu[index].cpu_active_total -
|
||||
cpu[index].cpu_last_active_total) /
|
||||
(float) (cpu[index].cpu_total - cpu[index].cpu_last_total);
|
||||
cpu[idx].cpu_val[0] = (cpu[idx].cpu_active_total -
|
||||
cpu[idx].cpu_last_active_total) /
|
||||
(float) (cpu[idx].cpu_total - cpu[idx].cpu_last_total);
|
||||
curtmp = 0;
|
||||
for (i = 0; i < info.cpu_avg_samples; i++) {
|
||||
curtmp += cpu[index].cpu_val[i];
|
||||
curtmp += cpu[idx].cpu_val[i];
|
||||
}
|
||||
/* TESTING -- I've removed this, because I don't think it is right.
|
||||
* You shouldn't divide by the cpu count here ...
|
||||
* removing for testing */
|
||||
/* if (index == 0) {
|
||||
info.cpu_usage[index] = curtmp / info.cpu_avg_samples /
|
||||
/* if (idx == 0) {
|
||||
info.cpu_usage[idx] = curtmp / info.cpu_avg_samples /
|
||||
info.cpu_count;
|
||||
} else {
|
||||
info.cpu_usage[index] = curtmp / info.cpu_avg_samples;
|
||||
info.cpu_usage[idx] = curtmp / info.cpu_avg_samples;
|
||||
} */
|
||||
/* TESTING -- this line replaces the prev. "suspect" if/else */
|
||||
info.cpu_usage[index] = curtmp / info.cpu_avg_samples;
|
||||
info.cpu_usage[idx] = curtmp / info.cpu_avg_samples;
|
||||
|
||||
cpu[index].cpu_last_total = cpu[index].cpu_total;
|
||||
cpu[index].cpu_last_active_total = cpu[index].cpu_active_total;
|
||||
cpu[idx].cpu_last_total = cpu[idx].cpu_total;
|
||||
cpu[idx].cpu_last_active_total = cpu[idx].cpu_active_total;
|
||||
for (i = info.cpu_avg_samples - 1; i > 0; i--) {
|
||||
cpu[index].cpu_val[i] = cpu[index].cpu_val[i - 1];
|
||||
cpu[idx].cpu_val[i] = cpu[idx].cpu_val[i - 1];
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -815,7 +815,7 @@ static int get_first_file_in_a_directory(const char *dir, char *s, int *rep)
|
||||
}
|
||||
|
||||
int open_sysfs_sensor(const char *dir, const char *dev, const char *type, int n,
|
||||
int *div, char *devtype)
|
||||
int *divisor, char *devtype)
|
||||
{
|
||||
char path[256];
|
||||
char buf[256];
|
||||
@ -868,9 +868,9 @@ int open_sysfs_sensor(const char *dir, const char *dev, const char *type, int n,
|
||||
|
||||
if (strcmp(type, "in") == 0 || strcmp(type, "temp") == 0
|
||||
|| strcmp(type, "tempf") == 0) {
|
||||
*div = 1;
|
||||
*divisor = 1;
|
||||
} else {
|
||||
*div = 0;
|
||||
*divisor = 0;
|
||||
}
|
||||
/* fan does not use *_div as a read divisor */
|
||||
if (strcmp("fan", type) == 0) {
|
||||
@ -897,7 +897,7 @@ int open_sysfs_sensor(const char *dir, const char *dev, const char *type, int n,
|
||||
ERR("open_sysfs_sensor(): can't read from sysfs");
|
||||
} else {
|
||||
divbuf[divn] = '\0';
|
||||
*div = atoi(divbuf);
|
||||
*divisor = atoi(divbuf);
|
||||
}
|
||||
}
|
||||
|
||||
@ -906,7 +906,7 @@ int open_sysfs_sensor(const char *dir, const char *dev, const char *type, int n,
|
||||
return fd;
|
||||
}
|
||||
|
||||
double get_sysfs_info(int *fd, int div, char *devtype, char *type)
|
||||
double get_sysfs_info(int *fd, int divisor, char *devtype, char *type)
|
||||
{
|
||||
int val = 0;
|
||||
|
||||
@ -947,17 +947,17 @@ double get_sysfs_info(int *fd, int div, char *devtype, char *type)
|
||||
/* divide voltage and temperature by 1000 */
|
||||
/* or if any other divisor is given, use that */
|
||||
if (strcmp(type, "tempf") == 0) {
|
||||
if (div > 1) {
|
||||
return ((val / div + 40) * 9.0 / 5) - 40;
|
||||
} else if (div) {
|
||||
if (divisor > 1) {
|
||||
return ((val / divisor + 40) * 9.0 / 5) - 40;
|
||||
} else if (divisor) {
|
||||
return ((val / 1000.0 + 40) * 9.0 / 5) - 40;
|
||||
} else {
|
||||
return ((val + 40) * 9.0 / 5) - 40;
|
||||
}
|
||||
} else {
|
||||
if (div > 1) {
|
||||
return val / div;
|
||||
} else if (div) {
|
||||
if (divisor > 1) {
|
||||
return val / divisor;
|
||||
} else if (divisor) {
|
||||
return val / 1000.0;
|
||||
} else {
|
||||
return val;
|
||||
@ -1520,7 +1520,7 @@ int get_battery_idx(const char *bat)
|
||||
return idx;
|
||||
}
|
||||
|
||||
void get_battery_stuff(char *buf, unsigned int n, const char *bat, int item)
|
||||
void get_battery_stuff(char *buffer, unsigned int n, const char *bat, int item)
|
||||
{
|
||||
static int idx, rep = 0, rep2 = 0;
|
||||
char acpi_path[128];
|
||||
@ -1664,12 +1664,12 @@ void get_battery_stuff(char *buf, unsigned int n, const char *bat, int item)
|
||||
|
||||
/* read last full capacity if it's zero */
|
||||
if (acpi_last_full[idx] == 0) {
|
||||
static int rep = 0;
|
||||
static int rep3 = 0;
|
||||
char path[128];
|
||||
FILE *fp;
|
||||
|
||||
snprintf(path, 127, ACPI_BATTERY_BASE_PATH "/%s/info", bat);
|
||||
fp = open_file(path, &rep);
|
||||
fp = open_file(path, &rep3);
|
||||
if (fp != NULL) {
|
||||
while (!feof(fp)) {
|
||||
char b[256];
|
||||
@ -1811,10 +1811,10 @@ void get_battery_stuff(char *buf, unsigned int n, const char *bat, int item)
|
||||
set_return_value:
|
||||
switch (item) {
|
||||
case BATTERY_STATUS:
|
||||
snprintf(buf, n, "%s", last_battery_str[idx]);
|
||||
snprintf(buffer, n, "%s", last_battery_str[idx]);
|
||||
break;
|
||||
case BATTERY_TIME:
|
||||
snprintf(buf, n, "%s", last_battery_time_str[idx]);
|
||||
snprintf(buffer, n, "%s", last_battery_time_str[idx]);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
@ -1878,12 +1878,12 @@ int get_battery_perct(const char *bat)
|
||||
/* ACPI */
|
||||
/* read last full capacity if it's zero */
|
||||
if (acpi_design_capacity[idx] == 0) {
|
||||
static int rep;
|
||||
static int rep2;
|
||||
char path[128];
|
||||
FILE *fp;
|
||||
|
||||
snprintf(path, 127, ACPI_BATTERY_BASE_PATH "/%s/info", bat);
|
||||
fp = open_file(path, &rep);
|
||||
fp = open_file(path, &rep2);
|
||||
if (fp != NULL) {
|
||||
while (!feof(fp)) {
|
||||
char b[256];
|
||||
@ -1957,18 +1957,18 @@ static char pb_battery_info[3][32];
|
||||
static double pb_battery_info_update;
|
||||
|
||||
#define PMU_PATH "/proc/pmu"
|
||||
void get_powerbook_batt_info(char *buf, size_t n, int i)
|
||||
void get_powerbook_batt_info(char *buffer, size_t n, int i)
|
||||
{
|
||||
static int rep = 0;
|
||||
const char *batt_path = PMU_PATH "/battery_0";
|
||||
const char *info_path = PMU_PATH "/info";
|
||||
unsigned int flags;
|
||||
int charge, max_charge, ac = -1;
|
||||
long time = -1;
|
||||
long timeval = -1;
|
||||
|
||||
/* don't update battery too often */
|
||||
if (current_update_time - pb_battery_info_update < 29.5) {
|
||||
snprintf(buf, n, "%s", pb_battery_info[i]);
|
||||
snprintf(buffer, n, "%s", pb_battery_info[i]);
|
||||
return;
|
||||
}
|
||||
pb_battery_info_update = current_update_time;
|
||||
@ -1993,7 +1993,7 @@ void get_powerbook_batt_info(char *buf, size_t n, int i)
|
||||
} else if (buf[0] == 'm') {
|
||||
sscanf(buf, "max_charge : %d", &max_charge);
|
||||
} else if (buf[0] == 't') {
|
||||
sscanf(buf, "time rem. : %ld", &time);
|
||||
sscanf(buf, "time rem. : %ld", &timeval);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -2027,7 +2027,7 @@ void get_powerbook_batt_info(char *buf, size_t n, int i)
|
||||
}
|
||||
|
||||
/* update percentage string */
|
||||
if (time == 0) {
|
||||
if (timeval == 0) {
|
||||
pb_battery_info[PB_BATT_PERCENT][0] = 0;
|
||||
} else {
|
||||
snprintf(pb_battery_info[PB_BATT_PERCENT],
|
||||
@ -2036,17 +2036,17 @@ void get_powerbook_batt_info(char *buf, size_t n, int i)
|
||||
}
|
||||
|
||||
/* update time string */
|
||||
if (time == 0) { /* fully charged or battery not present */
|
||||
if (timeval == 0) { /* fully charged or battery not present */
|
||||
pb_battery_info[PB_BATT_TIME][0] = 0;
|
||||
} else if (time < 60 * 60) { /* don't show secs */
|
||||
} else if (timeval < 60 * 60) { /* don't show secs */
|
||||
format_seconds_short(pb_battery_info[PB_BATT_TIME],
|
||||
sizeof(pb_battery_info[PB_BATT_TIME]), time);
|
||||
sizeof(pb_battery_info[PB_BATT_TIME]), timeval);
|
||||
} else {
|
||||
format_seconds(pb_battery_info[PB_BATT_TIME],
|
||||
sizeof(pb_battery_info[PB_BATT_TIME]), time);
|
||||
sizeof(pb_battery_info[PB_BATT_TIME]), timeval);
|
||||
}
|
||||
|
||||
snprintf(buf, n, "%s", pb_battery_info[i]);
|
||||
snprintf(buffer, n, "%s", pb_battery_info[i]);
|
||||
}
|
||||
|
||||
void update_top(void)
|
||||
|
||||
10
src/mail.c
10
src/mail.c
@ -39,7 +39,7 @@ char *current_mail_spool;
|
||||
|
||||
void update_mail_count(struct local_mail_s *mail)
|
||||
{
|
||||
struct stat buf;
|
||||
struct stat st;
|
||||
|
||||
if (mail == NULL) {
|
||||
return;
|
||||
@ -54,7 +54,7 @@ void update_mail_count(struct local_mail_s *mail)
|
||||
mail->last_update = current_update_time;
|
||||
}
|
||||
|
||||
if (stat(mail->box, &buf)) {
|
||||
if (stat(mail->box, &st)) {
|
||||
static int rep;
|
||||
|
||||
if (!rep) {
|
||||
@ -65,7 +65,7 @@ void update_mail_count(struct local_mail_s *mail)
|
||||
}
|
||||
#if HAVE_DIRENT_H
|
||||
/* maildir format */
|
||||
if (S_ISDIR(buf.st_mode)) {
|
||||
if (S_ISDIR(st.st_mode)) {
|
||||
DIR *dir;
|
||||
char *dirname;
|
||||
struct dirent *dirent;
|
||||
@ -122,7 +122,7 @@ void update_mail_count(struct local_mail_s *mail)
|
||||
}
|
||||
#endif
|
||||
/* mbox format */
|
||||
if (buf.st_mtime != mail->last_mtime) {
|
||||
if (st.st_mtime != mail->last_mtime) {
|
||||
/* yippee, modification time has changed, let's read mail count! */
|
||||
static int rep;
|
||||
FILE *fp;
|
||||
@ -192,6 +192,6 @@ void update_mail_count(struct local_mail_s *mail)
|
||||
mail->new_mail_count++;
|
||||
}
|
||||
|
||||
mail->last_mtime = buf.st_mtime;
|
||||
mail->last_mtime = st.st_mtime;
|
||||
}
|
||||
}
|
||||
|
||||
@ -352,8 +352,8 @@ static unsigned long long calc_cpu_total(void)
|
||||
int ps;
|
||||
char line[BUFFER_LEN] = { 0 };
|
||||
unsigned long long cpu = 0;
|
||||
unsigned long long nice = 0;
|
||||
unsigned long long system = 0;
|
||||
unsigned long long niceval = 0;
|
||||
unsigned long long systemval = 0;
|
||||
unsigned long long idle = 0;
|
||||
unsigned long long iowait = 0;
|
||||
unsigned long long irq = 0;
|
||||
@ -369,9 +369,9 @@ static unsigned long long calc_cpu_total(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
sscanf(line, template, &cpu, &nice, &system, &idle, &iowait, &irq,
|
||||
sscanf(line, template, &cpu, &niceval, &systemval, &idle, &iowait, &irq,
|
||||
&softirq, &steal);
|
||||
total = cpu + nice + system + idle + iowait + irq + softirq + steal;
|
||||
total = cpu + niceval + systemval + idle + iowait + irq + softirq + steal;
|
||||
|
||||
t = total - previous_total;
|
||||
previous_total = total;
|
||||
|
||||
@ -72,16 +72,16 @@ static void user_term(char *ptr)
|
||||
static void user_time(char *ptr)
|
||||
{
|
||||
const struct utmp *usr;
|
||||
time_t login, real, diff;
|
||||
time_t log_in, real, diff;
|
||||
struct tm *dtime;
|
||||
char buf[512] = "";
|
||||
|
||||
setutent();
|
||||
while ((usr = getutent()) != NULL) {
|
||||
if (usr->ut_type == USER_PROCESS) {
|
||||
login = usr->ut_time;
|
||||
log_in = usr->ut_time;
|
||||
time(&real);
|
||||
diff = difftime(real, login);
|
||||
diff = difftime(real, log_in);
|
||||
dtime = localtime(&diff);
|
||||
dtime->tm_year = dtime->tm_year - 70;
|
||||
dtime->tm_mon = dtime->tm_mon - 1;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user