Make errbuf optional, so if a caller is not interested in an error
message she can pass NULL (procstat(1) already does this). MFC after: 2 weeks
This commit is contained in:
parent
63efd0a107
commit
467112b4d1
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=250378
@ -897,6 +897,7 @@ procstat_get_pipe_info(struct procstat *procstat, struct filestat *fst,
|
||||
return (procstat_get_pipe_info_sysctl(fst, ps, errbuf));
|
||||
} else {
|
||||
warnx("unknown access method: %d", procstat->type);
|
||||
if (errbuf != NULL)
|
||||
snprintf(errbuf, _POSIX2_LINE_MAX, "error");
|
||||
return (1);
|
||||
}
|
||||
@ -926,6 +927,7 @@ procstat_get_pipe_info_kvm(kvm_t *kd, struct filestat *fst,
|
||||
return (0);
|
||||
|
||||
fail:
|
||||
if (errbuf != NULL)
|
||||
snprintf(errbuf, _POSIX2_LINE_MAX, "error");
|
||||
return (1);
|
||||
}
|
||||
@ -962,6 +964,7 @@ procstat_get_pts_info(struct procstat *procstat, struct filestat *fst,
|
||||
return (procstat_get_pts_info_sysctl(fst, pts, errbuf));
|
||||
} else {
|
||||
warnx("unknown access method: %d", procstat->type);
|
||||
if (errbuf != NULL)
|
||||
snprintf(errbuf, _POSIX2_LINE_MAX, "error");
|
||||
return (1);
|
||||
}
|
||||
@ -990,6 +993,7 @@ procstat_get_pts_info_kvm(kvm_t *kd, struct filestat *fst,
|
||||
return (0);
|
||||
|
||||
fail:
|
||||
if (errbuf != NULL)
|
||||
snprintf(errbuf, _POSIX2_LINE_MAX, "error");
|
||||
return (1);
|
||||
}
|
||||
@ -1025,6 +1029,7 @@ procstat_get_sem_info(struct procstat *procstat, struct filestat *fst,
|
||||
return (procstat_get_sem_info_sysctl(fst, sem, errbuf));
|
||||
} else {
|
||||
warnx("unknown access method: %d", procstat->type);
|
||||
if (errbuf != NULL)
|
||||
snprintf(errbuf, _POSIX2_LINE_MAX, "error");
|
||||
return (1);
|
||||
}
|
||||
@ -1071,6 +1076,7 @@ procstat_get_sem_info_kvm(kvm_t *kd, struct filestat *fst,
|
||||
return (0);
|
||||
|
||||
fail:
|
||||
if (errbuf != NULL)
|
||||
snprintf(errbuf, _POSIX2_LINE_MAX, "error");
|
||||
return (1);
|
||||
}
|
||||
@ -1106,6 +1112,7 @@ procstat_get_shm_info(struct procstat *procstat, struct filestat *fst,
|
||||
return (procstat_get_shm_info_sysctl(fst, shm, errbuf));
|
||||
} else {
|
||||
warnx("unknown access method: %d", procstat->type);
|
||||
if (errbuf != NULL)
|
||||
snprintf(errbuf, _POSIX2_LINE_MAX, "error");
|
||||
return (1);
|
||||
}
|
||||
@ -1152,6 +1159,7 @@ procstat_get_shm_info_kvm(kvm_t *kd, struct filestat *fst,
|
||||
return (0);
|
||||
|
||||
fail:
|
||||
if (errbuf != NULL)
|
||||
snprintf(errbuf, _POSIX2_LINE_MAX, "error");
|
||||
return (1);
|
||||
}
|
||||
@ -1187,6 +1195,7 @@ procstat_get_vnode_info(struct procstat *procstat, struct filestat *fst,
|
||||
return (procstat_get_vnode_info_sysctl(fst, vn, errbuf));
|
||||
} else {
|
||||
warnx("unknown access method: %d", procstat->type);
|
||||
if (errbuf != NULL)
|
||||
snprintf(errbuf, _POSIX2_LINE_MAX, "error");
|
||||
return (1);
|
||||
}
|
||||
@ -1254,6 +1263,7 @@ procstat_get_vnode_info_kvm(kvm_t *kd, struct filestat *fst,
|
||||
break;
|
||||
}
|
||||
if (i == NTYPES) {
|
||||
if (errbuf != NULL)
|
||||
snprintf(errbuf, _POSIX2_LINE_MAX, "?(%s)", tagstr);
|
||||
return (1);
|
||||
}
|
||||
@ -1268,6 +1278,7 @@ procstat_get_vnode_info_kvm(kvm_t *kd, struct filestat *fst,
|
||||
return (0);
|
||||
|
||||
fail:
|
||||
if (errbuf != NULL)
|
||||
snprintf(errbuf, _POSIX2_LINE_MAX, "error");
|
||||
return (1);
|
||||
}
|
||||
@ -1349,7 +1360,10 @@ procstat_get_vnode_info_sysctl(struct filestat *fst, struct vnstat *vn,
|
||||
if (vntype == PS_FST_VTYPE_VNON || vntype == PS_FST_VTYPE_VBAD)
|
||||
return (0);
|
||||
if ((status & KF_ATTR_VALID) == 0) {
|
||||
snprintf(errbuf, _POSIX2_LINE_MAX, "? (no info available)");
|
||||
if (errbuf != NULL) {
|
||||
snprintf(errbuf, _POSIX2_LINE_MAX,
|
||||
"? (no info available)");
|
||||
}
|
||||
return (1);
|
||||
}
|
||||
if (path && *path) {
|
||||
@ -1390,6 +1404,7 @@ procstat_get_socket_info(struct procstat *procstat, struct filestat *fst,
|
||||
return (procstat_get_socket_info_sysctl(fst, sock, errbuf));
|
||||
} else {
|
||||
warnx("unknown access method: %d", procstat->type);
|
||||
if (errbuf != NULL)
|
||||
snprintf(errbuf, _POSIX2_LINE_MAX, "error");
|
||||
return (1);
|
||||
}
|
||||
@ -1488,6 +1503,7 @@ procstat_get_socket_info_kvm(kvm_t *kd, struct filestat *fst,
|
||||
return (0);
|
||||
|
||||
fail:
|
||||
if (errbuf != NULL)
|
||||
snprintf(errbuf, _POSIX2_LINE_MAX, "error");
|
||||
return (1);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user