PERFORCE change 83142 for review

[Victor Cruceru]

http://perforce.freebsd.org/chv.cgi?CH=83142

Change 83142 by soc-victor at 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;
 				}
 				
 			}