From owner-p4-projects@FreeBSD.ORG Mon Sep 5 19:04:15 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 42BFC16A44C; Mon, 5 Sep 2005 19:04:15 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F40E616A420 for ; Mon, 5 Sep 2005 19:04:14 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A9F4743D53 for ; Mon, 5 Sep 2005 19:04:14 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j85J4Ecl006724 for ; Mon, 5 Sep 2005 19:04:14 GMT (envelope-from soc-victor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j85J4E4I006721 for perforce@freebsd.org; Mon, 5 Sep 2005 19:04:14 GMT (envelope-from soc-victor@freebsd.org) Date: Mon, 5 Sep 2005 19:04:14 GMT Message-Id: <200509051904.j85J4E4I006721@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-victor@freebsd.org using -f From: Victor Cruceru To: Perforce Change Reviews Cc: Subject: PERFORCE change 83142 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Sep 2005 19:04:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=83142 Change 83142 by soc-victor@soc-victor_82.76.158.176 on 2005/09/05 19:03:25 Make the HR BSNMP module to compile and work for 6.0 (again...) Affected files ... .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c#13 edit Differences ... ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c#13 (text+ko) ==== @@ -436,7 +436,7 @@ entry->type = OIDX_hrDeviceDiskStorage_c; entry->id = oid_zeroDotZero; /*unknown id - FIX ME*/ - entry->status = DR_RUNNING; + entry->status = (int32_t)DS_RUNNING; entry->errors = 0; /*FIX ME*/ snprintf(entry->descr, sizeof(entry->descr) - 1, "%s: <%s, ser. %s> ", @@ -468,23 +468,23 @@ sizeof(disk_entry->dev_name)-1); if (strncmp(disk_entry->dev_name, "ad", strlen("ad")) == 0) { - disk_entry->media = DSM_HARDDISK; - disk_entry->removable = SNMP_FALSE; + disk_entry->media = (int32_t)DSM_HARDDISK; + disk_entry->removable = (int32_t)SNMP_FALSE; } else if (strncmp(disk_entry->dev_name, "ar", strlen("ar")) == 0) { - disk_entry->media = DSM_OTHER; - disk_entry->removable = SNMP_FALSE; + disk_entry->media = (int32_t)DSM_OTHER; + disk_entry->removable = (int32_t)SNMP_FALSE; } else if (strncmp(disk_entry->dev_name, "acd", strlen("acd")) == 0) { - disk_entry->media = DSM_OPTICALDISKROM; - disk_entry->removable = SNMP_TRUE; + disk_entry->media = (int32_t)DSM_OPTICALDISKROM; + disk_entry->removable = (int32_t)SNMP_TRUE; } else if (strncmp(disk_entry->dev_name, "afd", strlen("afd")) == 0) { - disk_entry->media = DSM_FLOPPYDISK; - disk_entry->removable = SNMP_TRUE; + disk_entry->media = (int32_t)DSM_FLOPPYDISK; + disk_entry->removable = (int32_t)SNMP_TRUE; } else if (strncmp(disk_entry->dev_name, "ast", strlen("ast")) == 0) { - disk_entry->media = DSM_OTHER; - disk_entry->removable = SNMP_TRUE; + disk_entry->media = (int32_t)DSM_OTHER; + disk_entry->removable = (int32_t)SNMP_TRUE; } else { - disk_entry->media = DSM_UNKNOWN; - disk_entry->removable = SNMP_FALSE; + disk_entry->media = (int32_t)DSM_UNKNOWN; + disk_entry->removable = (int32_t)SNMP_FALSE; } }