Page MenuHomeFreeBSD
Files F148625498

D39797.id120993.diff
No OneTemporary
Actions

D39797.id120993.diff
View Options

diff --git a/usr.sbin/prometheus_sysctl_exporter/prometheus_sysctl_exporter.c b/usr.sbin/prometheus_sysctl_exporter/prometheus_sysctl_exporter.c
--- a/usr.sbin/prometheus_sysctl_exporter/prometheus_sysctl_exporter.c
+++ b/usr.sbin/prometheus_sysctl_exporter/prometheus_sysctl_exporter.c
@@ -62,7 +62,7 @@
oid_get_root(struct oid *o)
{
- o->id[0] = 1;
+ o->id[0] = CTL_KERN;
o->len = 1;
}
@@ -91,8 +91,8 @@
int lookup[CTL_MAXNAME + 2];
size_t nextsize;
- lookup[0] = 0;
- lookup[1] = 2;
+ lookup[0] = CTL_SYSCTL;
+ lookup[1] = CTL_SYSCTL_NEXT;
memcpy(lookup + 2, cur->id, cur->len * sizeof(lookup[0]));
nextsize = sizeof(next->id);
if (sysctl(lookup, 2 + cur->len, &next->id, &nextsize, 0, 0) != 0) {
@@ -135,8 +135,8 @@
int lookup[CTL_MAXNAME + 2];
size_t oflen;
- lookup[0] = 0;
- lookup[1] = 4;
+ lookup[0] = CTL_SYSCTL;
+ lookup[1] = CTL_SYSCTL_OIDFMT;
memcpy(lookup + 2, o->id, o->len * sizeof(lookup[0]));
oflen = sizeof(*of);
if (sysctl(lookup, 2 + o->len, of, &oflen, 0, 0) != 0) {
@@ -344,8 +344,8 @@
size_t i, len;
/* Fetch the name and split it up in separate components. */
- lookup[0] = 0;
- lookup[1] = 1;
+ lookup[0] = CTL_SYSCTL;
+ lookup[1] = CTL_SYSCTL_NAME;
memcpy(lookup + 2, o->id, o->len * sizeof(lookup[0]));
len = sizeof(on->names);
if (sysctl(lookup, 2 + o->len, on->names, &len, 0, 0) != 0)
@@ -464,8 +464,8 @@
char *newline;
size_t odlen;
- lookup[0] = 0;
- lookup[1] = 5;
+ lookup[0] = CTL_SYSCTL;
+ lookup[1] = CTL_SYSCTL_OIDDESCR;
memcpy(lookup + 2, o->id, o->len * sizeof(lookup[0]));
odlen = sizeof(od->description);
if (sysctl(lookup, 2 + o->len, &od->description, &odlen, 0, 0) != 0) {

File Metadata

Mime Type
text/plain
Expires
Fri, Mar 20, 5:33 AM (20 h, 45 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29998910
Default Alt Text
D39797.id120993.diff (1 KB)

Event Timeline