diff options
| author | harti <harti@FreeBSD.org> | 2006-01-12 07:44:40 +0000 |
|---|---|---|
| committer | harti <harti@FreeBSD.org> | 2006-01-12 07:44:40 +0000 |
| commit | ec693c19f9eea76a69262b3e50addf393b1595f9 (patch) | |
| tree | b912dc25d3f742cf29d9a29e17dcd793953666fc /usr.sbin/bsnmpd | |
| parent | 3668a2e4940ebe0e7c33729ad375a9a7b0c6ceb1 (diff) | |
| download | FreeBSD-src-ec693c19f9eea76a69262b3e50addf393b1595f9.zip FreeBSD-src-ec693c19f9eea76a69262b3e50addf393b1595f9.tar.gz | |
Fix build without -DNDEBUG.
Spotted by: obrien
Diffstat (limited to 'usr.sbin/bsnmpd')
3 files changed, 7 insertions, 7 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 2df4d3e..cca9bcb 100644 --- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c +++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c @@ -399,7 +399,7 @@ refresh_processor_tbl(void) continue; } - assert(hrState_g.kd != NULL); + assert(hr_kd != NULL); plist = kvm_getprocs(hr_kd, KERN_PROC_PID, entry->idle_pid, &nproc); diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c index 6e62d0e..945a9bd 100644 --- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c +++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c @@ -97,9 +97,9 @@ OS_getSystemUptime(uint32_t *ut) return (SNMP_ERR_GENERR); } - HRDBG("boot timestamp from kernel: {%ld, %ld}", - kernel_boot_timestamp.tv_sec, - kernel_boot_timestamp.tv_usec); + HRDBG("boot timestamp from kernel: {%lld, %ld}", + (long long)kernel_boot_timestamp.tv_sec, + (long)kernel_boot_timestamp.tv_usec); kernel_boot = ((uint64_t)kernel_boot_timestamp.tv_sec * 100) + (kernel_boot_timestamp.tv_usec / 10000); 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 bf9ecab..18fc57f 100644 --- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c +++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c @@ -207,7 +207,7 @@ kinfo_proc_to_swrun_entry(const struct kinfo_proc *kp, entry->path[0] = '\0'; entry->parameters[0] = '\0'; - assert(hrState_g.kd != NULL); + assert(hr_kd != NULL); argv = kvm_getargv(hr_kd, kp, sizeof(entry->parameters) - 1); if(argv != NULL){ @@ -423,7 +423,7 @@ fetch_swrun_entry(struct swrun_entry *entry) } else { /* this is a process */ - assert(hrState_g.kd != NULL); + assert(hr_kd != NULL); plist = kvm_getprocs(hr_kd, KERN_PROC_PID, entry->index - 1, &nproc); if (plist == NULL || nproc != 1) { @@ -489,7 +489,7 @@ invalidate_swrun_entry(struct swrun_entry *entry, int commit) } } else { /* this is a process */ - assert(hrState_g.kd != NULL); + assert(hr_kd != NULL); plist = kvm_getprocs(hr_kd, KERN_PROC_PID, entry->index - 1, &nproc); |
