PERFORCE change 82868 for review
Victor Cruceru
soc-victor at FreeBSD.org
Tue Aug 30 19:35:06 GMT 2005
http://perforce.freebsd.org/chv.cgi?CH=82868
Change 82868 by soc-victor at soc-victor_82.76.158.176 on 2005/08/30 19:34:38
Some cleanup for HR-MIB
Affected files ...
.. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#10 edit
.. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c#10 edit
.. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#27 edit
Differences ...
==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#10 (text+ko) ====
@@ -36,8 +36,6 @@
#include <assert.h>
#include <stdlib.h>
#include <err.h>
-#include <sys/types.h>
-#include <sys/socket.h>
#include <sys/un.h>
#include <unistd.h>
#include <errno.h>
@@ -80,8 +78,11 @@
STAILQ_FOREACH(map, &hrState_g.device_name_map, link)
- if (strcmp(map->name_key, dev_p->dd_name) == 0 &&
- strcmp(map->location_key, dev_p->dd_location) == 0) {
+ if (strcmp((const char *)map->name_key,
+ (const char *)dev_p->dd_name) == 0 &&
+ strcmp((const char *)map->location_key,
+ (const char *)dev_p->dd_location) == 0) {
+
entry->index = map->hrIndex;
map->entry_p = entry;
break;
@@ -102,10 +103,15 @@
map->hrIndex = hrState_g.next_hrDevice_index ++;
memset(&map->name_key[0], 0, sizeof(map->name_key));
- strncpy(map->name_key, dev_p->dd_name, sizeof(map->name_key) - 1);
+
+ strncpy( (char*)map->name_key,
+ (const char *)dev_p->dd_name,
+ sizeof(map->name_key) - 1);
memset(&map->location_key[0], 0, sizeof(map->location_key));
- strncpy(map->location_key, dev_p->dd_location, sizeof(map->location_key) - 1);
+ strncpy((char*)map->location_key,
+ dev_p->dd_location,
+ sizeof(map->location_key) - 1);
map->entry_p = entry;
STAILQ_INSERT_TAIL(&hrState_g.device_name_map, map, link);
@@ -121,10 +127,14 @@
entry->index = map->hrIndex;
memset(&entry->name[0], 0, sizeof(entry->name));
- strncpy(entry->name, dev_p->dd_name, sizeof(entry->name) - 1);
+ strncpy((char*)entry->name,
+ dev_p->dd_name,
+ sizeof(entry->name) - 1);
memset(&entry->location[0], 0, sizeof(entry->location));
- strncpy(entry->location, dev_p->dd_location, sizeof(entry->location) - 1);
+ strncpy((char*)entry->location,
+ dev_p->dd_location,
+ sizeof(entry->location) - 1);
INSERT_OBJECT_INT(entry, &hrState_g.hr_device_tbl);
@@ -157,8 +167,11 @@
STAILQ_FOREACH(map, &hrState_g.device_name_map, link)
- if (strcmp(map->name_key, dev_p->dd_name) == 0 &&
- strcmp(map->location_key, dev_p->dd_location) == 0) {
+ if (strcmp((const char*)map->name_key,
+ (const char*)dev_p->dd_name) == 0 &&
+ strcmp((const char*)map->location_key,
+ (const char*)dev_p->dd_location) == 0) {
+
return (map->entry_p);
}
return (NULL);
@@ -178,6 +191,7 @@
static
void hrDevice_getType_v(struct devinfo_dev *dev_p, struct asn_oid *out_type_p) {
+
assert(dev_p != NULL);
assert(out_type_p != NULL);
if(dev_p == NULL)
@@ -185,9 +199,10 @@
if (strncmp(dev_p->dd_name, "cpu", strlen("cpu")) == 0 &&
strstr(dev_p->dd_location, ".CPU") != NULL) {
- *out_type_p = (struct asn_oid)OIDX_hrDeviceProcessor;
+ *out_type_p = (struct asn_oid)OIDX_hrDeviceProcessor;
return;
}
+
*out_type_p = (struct asn_oid)OIDX_hrDeviceOther; /*FIX ME*/
}
@@ -228,17 +243,19 @@
memset(entry->descr, 0, sizeof(entry->descr));
if (dev->dd_name[0] != '\0') {
- snprintf(entry->descr, sizeof(entry->descr) - 1,"%s: %s",
+ (void)snprintf((char*)entry->descr,
+ sizeof(entry->descr) - 1,"%s: %s",
dev->dd_name, dev->dd_desc);
} else {
- snprintf(entry->descr, sizeof(entry->descr) - 1,"unknown at %s",
- dev->dd_location);
+ (void)snprintf((char*)entry->descr,
+ sizeof(entry->descr) - 1,"unknown at %s",
+ dev->dd_location);
}
entry->id = oid_zeroDotZero; /*unknown id - FIX ME*/
- entry->status = hrDevice_getStatus(dev);
+ entry->status = (u_int)hrDevice_getStatus(dev);
entry->errors = 0; /*FIX ME*/
}
@@ -374,7 +391,10 @@
}
devd_addr.sun_family = PF_LOCAL;
- strlcpy(devd_addr.sun_path, devd_pipe_name, sizeof(devd_addr.sun_path) - 1);
+
+ (void)strlcpy(devd_addr.sun_path,
+ devd_pipe_name,
+ sizeof(devd_addr.sun_path) - 1);
if (connect(d_sock, (struct sockaddr *)&devd_addr,
sizeof(struct sockaddr_un)) == -1) {
@@ -472,7 +492,8 @@
return (SNMP_ERR_NOSUCHNAME);
}
- if ((entry = hrDeviceTblEntry_find_by_index(value->var.subs[sub])) == NULL) {
+ if ((entry = hrDeviceTblEntry_find_by_index(value->var.subs[sub]))
+ == NULL) {
return (SNMP_ERR_NOSUCHNAME);
}
break;
==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c#10 (text+ko) ====
@@ -38,7 +38,6 @@
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
-#include <sys/types.h>
#include <libdisk.h>
#include <assert.h>
#include <err.h>
@@ -146,7 +145,7 @@
STAILQ_FOREACH(map, &hrState_g.device_name_map, link)
- if (strcmp(map->name_key, dev_name) == 0) {
+ if (strcmp((const char*)map->name_key, dev_name) == 0) {
entry->index = map->hrIndex;
map->entry_p = entry;
break;
@@ -167,10 +166,12 @@
map->hrIndex = hrState_g.next_hrDevice_index ++;
memset(&map->name_key[0], 0, sizeof(map->name_key));
- strncpy(map->name_key, dev_name, sizeof(map->name_key) - 1);
+ strncpy((char*)map->name_key, dev_name, sizeof(map->name_key) - 1);
memset(&map->location_key[0], 0, sizeof(map->location_key));
- snprintf(map->location_key, sizeof(map->location_key) - 1, "%s%s", _PATH_DEV, dev_name);
+ (void)snprintf((char *)map->location_key,
+ sizeof(map->location_key) - 1,
+ "%s%s", _PATH_DEV, dev_name);
map->entry_p = entry;
@@ -187,10 +188,12 @@
entry->index = map->hrIndex;
memset(&entry->name[0], 0, sizeof(entry->name));
- strncpy(entry->name, dev_name, sizeof(entry->name) - 1);
+ strncpy((char *)entry->name, dev_name, sizeof(entry->name) - 1);
memset(&entry->location[0], 0, sizeof(entry->location));
- snprintf(entry->location, sizeof(entry->location) - 1, "%s%s", _PATH_DEV, dev_name);
+ (void)snprintf((char *)entry->location,
+ sizeof(entry->location) - 1,
+ "%s%s", _PATH_DEV, dev_name);
INSERT_OBJECT_INT(entry, &hrState_g.hr_device_tbl);
@@ -207,7 +210,7 @@
STAILQ_FOREACH(map, &hrState_g.device_name_map, link)
- if (strcmp(map->name_key, dev_name) == 0 ) {
+ if (strcmp((char *)map->name_key, dev_name) == 0 ) {
return (map->entry_p);
}
return (NULL);
@@ -224,7 +227,8 @@
if( entry->dev_name[0] == '\0' ) {
return;
}
- snprintf(dev_path, sizeof(dev_path) - 1, "%s%s", _PATH_DEV, entry->dev_name);
+ (void)snprintf(dev_path, sizeof(dev_path) - 1,
+ "%s%s", _PATH_DEV, entry->dev_name);
entry->capacity = 0;
HR_DPRINTF((stderr,"OPENING device %s\n",dev_path));
fd = open(dev_path, O_RDONLY|O_NONBLOCK);
@@ -245,10 +249,10 @@
}
mediasize = mediasize / 1024;
entry->capacity = (mediasize > (off_t)INT_MAX ? INT_MAX : mediasize);
- if (entry->media == DSM_HARDDISK) {
+ if (entry->media == (int32_t)DSM_HARDDISK) {
/*this silly libdisk crashes if a empty cdrom device
is oppened*/
- handleDiskStorage(entry->index, entry->dev_name);
+ handleDiskStorage(entry->index, (const char* )entry->dev_name);
}
}
QUERY_DONE:
@@ -313,9 +317,9 @@
entry->type = (struct asn_oid)OIDX_hrDeviceDiskStorage;
entry->id = oid_zeroDotZero; /*unknown id - FIX ME*/
- entry->status = DS_RUNNING;
+ entry->status = (int32_t)DS_RUNNING;
entry->errors = 0; /*FIX ME*/
- snprintf(entry->descr, sizeof(entry->descr) - 1,
+ (void)snprintf((char *)entry->descr, sizeof(entry->descr) - 1,
"%s: <%s, ser. %s> ",
u_iocmd.u.param.name[i],
u_iocmd.u.param.params[i].model,
@@ -337,28 +341,38 @@
if (disk_entry == NULL) {
continue;
}
- disk_entry->access = DS_READ_WRITE;
- memset(&disk_entry->dev_name[0], 0, sizeof(disk_entry->dev_name));
- strncpy(disk_entry->dev_name, u_iocmd.u.param.name[i], sizeof(disk_entry->dev_name)-1);
+ disk_entry->access = (int32_t)DS_READ_WRITE;
+
+ memset(&disk_entry->dev_name[0], 0,
+ sizeof(disk_entry->dev_name));
+
+ strncpy((char*)disk_entry->dev_name,
+ u_iocmd.u.param.name[i],
+ 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;
- } else if (strncmp(disk_entry->dev_name, "ar", strlen("ar")) == 0) {
- disk_entry->media = DSM_OTHER;
- disk_entry->removable = SNMP_FALSE;
- } else if (strncmp(disk_entry->dev_name, "acd", strlen("acd")) == 0) {
- disk_entry->media = DSM_OPTICALDISKROM;
- disk_entry->removable = SNMP_TRUE;
- } else if (strncmp(disk_entry->dev_name, "afd", strlen("afd")) == 0) {
- disk_entry->media = DSM_FLOPPYDISK;
- disk_entry->removable = SNMP_TRUE;
- } else if (strncmp(disk_entry->dev_name, "ast", strlen("ast")) == 0) {
- disk_entry->media = DSM_OTHER;
- disk_entry->removable = SNMP_TRUE;
+ if (strncmp((const char*)disk_entry->dev_name,
+ "ad", strlen("ad")) == 0) {
+ disk_entry->media = (int32_t)DSM_HARDDISK;
+ disk_entry->removable = (int32_t)SNMP_FALSE;
+ } else if (strncmp((const char*)disk_entry->dev_name,
+ "ar", strlen("ar")) == 0) {
+ disk_entry->media = (int32_t)DSM_OTHER;
+ disk_entry->removable = (int32_t)SNMP_FALSE;
+ } else if (strncmp((const char*)disk_entry->dev_name,
+ "acd", strlen("acd")) == 0) {
+ disk_entry->media = (int32_t)DSM_OPTICALDISKROM;
+ disk_entry->removable = (int32_t)SNMP_TRUE;
+ } else if (strncmp((const char*)disk_entry->dev_name,
+ "afd", strlen("afd")) == 0) {
+ disk_entry->media = (int32_t)DSM_FLOPPYDISK;
+ disk_entry->removable = (int32_t)SNMP_TRUE;
+ } else if (strncmp((const char*)disk_entry->dev_name,
+ "ast", strlen("ast")) == 0) {
+ 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;
}
}
@@ -505,7 +519,8 @@
}
for (unit = 0; unit < mdio.md_pad[0] && unit < MDNPAD - 1; unit++) {
char mddev[64] = "";
- snprintf(mddev, sizeof(mddev) - 1, "%s%d", MD_NAME, mdio.md_pad[unit + 1]);
+ (void)snprintf(mddev, sizeof(mddev) - 1, "%s%d",
+ MD_NAME, mdio.md_pad[unit + 1]);
struct md_ioctl u_mdio;
memset(&u_mdio, 0, sizeof(u_mdio));
@@ -532,9 +547,9 @@
entry->type = (struct asn_oid)OIDX_hrDeviceDiskStorage;
entry->id = oid_zeroDotZero; /*unknown id - FIX ME*/
- entry->status = DS_RUNNING;
+ entry->status = (int32_t)DS_RUNNING;
entry->errors = 0; /*FIX ME*/
- snprintf(entry->descr, sizeof(entry->descr) - 1,
+ (void)snprintf((char*)entry->descr, sizeof(entry->descr) - 1,
"%s: Memory Disk ",
mddev);
@@ -555,15 +570,17 @@
continue;
}
if ((u_mdio.md_options & MD_READONLY) == MD_READONLY) {
- disk_entry->access = DS_READ_ONLY;
+ disk_entry->access = (int32_t)DS_READ_ONLY;
} else {
- disk_entry->access = DS_READ_WRITE;
+ disk_entry->access = (int32_t)DS_READ_WRITE;
}
- memset(&disk_entry->dev_name[0], 0, sizeof(disk_entry->dev_name));
- strncpy(disk_entry->dev_name, mddev, sizeof(disk_entry->dev_name)-1);
+ memset(&disk_entry->dev_name[0],
+ 0, sizeof(disk_entry->dev_name));
+ strncpy((char *)disk_entry->dev_name,
+ mddev, sizeof(disk_entry->dev_name)-1);
- disk_entry->media = DSM_RAMDISK;
- disk_entry->removable = SNMP_FALSE;
+ disk_entry->media = (int32_t)DSM_RAMDISK;
+ disk_entry->removable = (int32_t)SNMP_FALSE;
}
@@ -625,7 +642,9 @@
disk = strsep(&hrState_g.disk_list, " ");
if (disk == NULL)
break;
- snprintf(disk_device, sizeof(disk_device) - 1, "%s%s", _PATH_DEV, disk);
+
+ (void)snprintf(disk_device, sizeof(disk_device) - 1,
+ "%s%s", _PATH_DEV, disk);
/*
First check if the disk is in the hrDeviceTable.
If not,add it.
@@ -640,9 +659,9 @@
entry->flags |= HR_DEVICE_IMMUTABLE;
entry->type = (struct asn_oid)OIDX_hrDeviceDiskStorage;
entry->id = oid_zeroDotZero; /*unknown id - FIX ME*/
- entry->status = DS_RUNNING;
+ entry->status = (int32_t)DS_RUNNING;
entry->errors = 0; /*FIX ME*/
- snprintf(entry->descr, sizeof(entry->descr) - 1,
+ (void)snprintf((char *)entry->descr, sizeof(entry->descr) - 1,
"%s: Disk Storage",
disk);
}else{
@@ -662,28 +681,34 @@
if ((disk_entry->flags & HR_DISKSTORAGE_ATA) == HR_DISKSTORAGE_ATA ||
(disk_entry->flags & HR_DISKSTORAGE_MD) == HR_DISKSTORAGE_MD) {
- /*ATA detection is running before this one, so don't waste the time here */
+ /*ATA detection is running before this one,
+ so don't waste the time here */
continue;
}
- disk_entry->access = DS_READ_WRITE;
- disk_entry->media = DSM_UNKNOWN;
- disk_entry->removable = SNMP_FALSE;
+ disk_entry->access = (int32_t)DS_READ_WRITE;
+ disk_entry->media = (int32_t)DSM_UNKNOWN;
+ disk_entry->removable = (int32_t)SNMP_FALSE;
- if (strncmp(disk_entry->dev_name, "da", strlen("da")) == 0) {
- disk_entry->media = DSM_HARDDISK;
- disk_entry->removable = SNMP_FALSE;
- } else if (strncmp(disk_entry->dev_name, "cd", strlen("cd")) == 0) {
- disk_entry->media = DSM_OPTICALDISKROM;
- disk_entry->removable = SNMP_TRUE;
+ if (strncmp((const char*)disk_entry->dev_name,
+ "da", strlen("da")) == 0) {
+ disk_entry->media = (int32_t)DSM_HARDDISK;
+ disk_entry->removable = (int32_t)SNMP_FALSE;
+ } else if (strncmp((const char*)disk_entry->dev_name,
+ "cd", strlen("cd")) == 0) {
+ disk_entry->media = (int32_t)DSM_OPTICALDISKROM;
+ 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;
}
- memset(&disk_entry->dev_name[0], 0, sizeof(disk_entry->dev_name));
- strncpy(disk_entry->dev_name, disk, sizeof(disk_entry->dev_name)-1);
+ memset(&disk_entry->dev_name[0], 0,
+ sizeof(disk_entry->dev_name));
+
+ strncpy((char *)disk_entry->dev_name, disk,
+ sizeof(disk_entry->dev_name)-1);
hrDiskStorage_queryDisk(disk_entry);
disk_entry->r_tick = this_tick;
==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#27 (text+ko) ====
@@ -37,7 +37,6 @@
#include <stdio.h> /*for FILE */
#include <fcntl.h> /*for kvm_open & friends*/
#include <kvm.h>
-#include <sys/time.h> /*for struct timeval*/
#include <sys/queue.h> /*for SLIST, TAILQ & friends*/
#include <sys/param.h> /*for getfsstat*/
@@ -46,7 +45,7 @@
#include <sys/vmmeter.h>
#include <devinfo.h>
-#include <sys/types.h>
+
/*a debug macro*/
#ifndef NDEBUG
More information about the p4-projects
mailing list