diff options
| author | harti <harti@FreeBSD.org> | 2006-01-26 12:19:10 +0000 |
|---|---|---|
| committer | harti <harti@FreeBSD.org> | 2006-01-26 12:19:10 +0000 |
| commit | 8c6899bf001b48d3f2bb84712e598b1090855c5e (patch) | |
| tree | a04a69770af610b2b009c6f169c1c76fead393c7 /usr.sbin/bsnmpd | |
| parent | 55cbb46d5fdc41cdf7e0751c870014a55c944b48 (diff) | |
| download | FreeBSD-src-8c6899bf001b48d3f2bb84712e598b1090855c5e.zip FreeBSD-src-8c6899bf001b48d3f2bb84712e598b1090855c5e.tar.gz | |
Replace ki_ocomm by ki_comm. The former will go away.
Submitted by: Victor Cruceru <soc-victor>
Suggested by: Julian Elischer
Diffstat (limited to 'usr.sbin/bsnmpd')
| -rw-r--r-- | usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c | 8 | ||||
| -rw-r--r-- | usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c index faba176..1c8273f 100644 --- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c +++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c @@ -213,18 +213,18 @@ processor_get_pids(void) if (!IS_KERNPROC(kp)) continue; - if (strcmp(kp->ki_ocomm, "idle") == 0) { + if (strcmp(kp->ki_comm, "idle") == 0) { /* single processor system */ cpu = 0; - } else if (sscanf(kp->ki_ocomm, "idle: cpu%d%n", &cpu, &nchars) - == 1 && (u_int)nchars == strlen(kp->ki_ocomm)) { + } else if (sscanf(kp->ki_comm, "idle: cpu%d%n", &cpu, &nchars) + == 1 && (u_int)nchars == strlen(kp->ki_comm)) { /* MP system */ } else /* not an idle process */ continue; HRDBG("'%s' proc with pid %d is on CPU #%d (last on #%d)", - kp->ki_ocomm, kp->ki_pid, kp->ki_oncpu, kp->ki_lastcpu); + kp->ki_comm, kp->ki_pid, kp->ki_oncpu, kp->ki_lastcpu); TAILQ_FOREACH(entry, &processor_tbl, link) if (entry->cpu_no == kp->ki_lastcpu) diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c index 18fc57f..7c05311 100644 --- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c +++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c @@ -200,7 +200,7 @@ kinfo_proc_to_swrun_entry(const struct kinfo_proc *kp, char **argv = NULL; uint64_t cpu_time = 0; - strlcpy((char*)entry->name, kp->ki_ocomm, sizeof(entry->name)); + strlcpy((char*)entry->name, kp->ki_comm, sizeof(entry->name)); entry->id = oid_zeroDotZero; /* unknown id - FIXME */ |
