projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.8'
[collectd.git]
/
src
/
processes.c
diff --git
a/src/processes.c
b/src/processes.c
index
89cf3e0
..
339c4d1
100644
(file)
--- a/
src/processes.c
+++ b/
src/processes.c
@@
-904,9
+904,7
@@
static int ps_read_tasks_status(process_entry_t *ps) {
} /* while (fgets) */
if (fclose(fh)) {
} /* while (fgets) */
if (fclose(fh)) {
- char errbuf[1024];
- WARNING("processes: fclose: %s",
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ WARNING("processes: fclose: %s", STRERRNO);
}
}
closedir(dh);
}
}
closedir(dh);
@@
-962,8
+960,7
@@
static int ps_read_status(long pid, process_entry_t *ps) {
} /* while (fgets) */
if (fclose(fh)) {
} /* while (fgets) */
if (fclose(fh)) {
- char errbuf[1024];
- WARNING("processes: fclose: %s", sstrerror(errno, errbuf, sizeof(errbuf)));
+ WARNING("processes: fclose: %s", STRERRNO);
}
ps->vmem_data = data * 1024;
}
ps->vmem_data = data * 1024;
@@
-1023,8
+1020,7
@@
static int ps_read_io(process_entry_t *ps) {
} /* while (fgets) */
if (fclose(fh)) {
} /* while (fgets) */
if (fclose(fh)) {
- char errbuf[1024];
- WARNING("processes: fclose: %s", sstrerror(errno, errbuf, sizeof(errbuf)));
+ WARNING("processes: fclose: %s", STRERRNO);
}
return 0;
} /* int ps_read_io (...) */
}
return 0;
} /* int ps_read_io (...) */
@@
-1048,8
+1044,7
@@
static int ps_count_maps(pid_t pid) {
} /* while (fgets) */
if (fclose(fh)) {
} /* while (fgets) */
if (fclose(fh)) {
- char errbuf[1024];
- WARNING("processes: fclose: %s", sstrerror(errno, errbuf, sizeof(errbuf)));
+ WARNING("processes: fclose: %s", STRERRNO);
}
return count;
} /* int ps_count_maps (...) */
}
return count;
} /* int ps_count_maps (...) */
@@
-1260,12
+1255,10
@@
static char *ps_get_cmdline(long pid, char *name, char *buf, size_t buf_len) {
errno = 0;
fd = open(file, O_RDONLY);
if (fd < 0) {
errno = 0;
fd = open(file, O_RDONLY);
if (fd < 0) {
- char errbuf[4096];
/* ENOENT means the process exited while we were handling it.
* Don't complain about this, it only fills the logs. */
if (errno != ENOENT)
/* ENOENT means the process exited while we were handling it.
* Don't complain about this, it only fills the logs. */
if (errno != ENOENT)
- WARNING("processes plugin: Failed to open `%s': %s.", file,
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ WARNING("processes plugin: Failed to open `%s': %s.", file, STRERRNO);
return NULL;
}
return NULL;
}
@@
-1280,13
+1273,12
@@
static char *ps_get_cmdline(long pid, char *name, char *buf, size_t buf_len) {
status = read(fd, (void *)buf_ptr, len);
if (status < 0) {
status = read(fd, (void *)buf_ptr, len);
if (status < 0) {
- char errbuf[1024];
if ((EAGAIN == errno) || (EINTR == errno))
continue;
WARNING("processes plugin: Failed to read from `%s': %s.", file,
if ((EAGAIN == errno) || (EINTR == errno))
continue;
WARNING("processes plugin: Failed to read from `%s': %s.", file,
-
sstrerror(errno, errbuf, sizeof(errbuf))
);
+
STRERRNO
);
close(fd);
return NULL;
}
close(fd);
return NULL;
}
@@
-1344,9
+1336,7
@@
static int read_fork_rate(void) {
proc_stat = fopen("/proc/stat", "r");
if (proc_stat == NULL) {
proc_stat = fopen("/proc/stat", "r");
if (proc_stat == NULL) {
- char errbuf[1024];
- ERROR("processes plugin: fopen (/proc/stat) failed: %s",
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ ERROR("processes plugin: fopen (/proc/stat) failed: %s", STRERRNO);
return -1;
}
return -1;
}
@@
-1858,8
+1848,7
@@
static int ps_read(void) {
ps_list_reset();
if ((proc = opendir("/proc")) == NULL) {
ps_list_reset();
if ((proc = opendir("/proc")) == NULL) {
- char errbuf[1024];
- ERROR("Cannot open `/proc': %s", sstrerror(errno, errbuf, sizeof(errbuf)));
+ ERROR("Cannot open `/proc': %s", STRERRNO);
return -1;
}
return -1;
}