diff options
| -rw-r--r-- | extras/scsi_id/scsi_serial.c | 5 | ||||
| -rw-r--r-- | namedev_parse.c | 2 | ||||
| -rw-r--r-- | udev_db.c | 2 | ||||
| -rw-r--r-- | udev_sysfs.c | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/extras/scsi_id/scsi_serial.c b/extras/scsi_id/scsi_serial.c index 0db756404c..8b9fbe0681 100644 --- a/extras/scsi_id/scsi_serial.c +++ b/extras/scsi_id/scsi_serial.c @@ -553,7 +553,7 @@ static int do_scsi_page83_inquiry(struct sysfs_device *scsi_dev, int fd, char *serial, int len) { int retval; - int id_ind, j; + unsigned int id_ind, j; unsigned char page_83[SCSI_INQ_BUFF_LEN]; memset(page_83, 0, SCSI_INQ_BUFF_LEN); @@ -584,8 +584,7 @@ static int do_scsi_page83_inquiry(struct sysfs_device *scsi_dev, int fd, * Examine each descriptor returned. There is normally only * one or a small number of descriptors. */ - for (j = 4; j <= page_83[3] + 3; - j += page_83[j + 3] + 4) { + for (j = 4; j <= (unsigned int)page_83[3] + 3; j += page_83[j + 3] + 4) { retval = check_fill_0x83_id(scsi_dev, &page_83[j], &id_search_list[id_ind], serial, len); diff --git a/namedev_parse.c b/namedev_parse.c index 3b14a6a500..5bd59d83f2 100644 --- a/namedev_parse.c +++ b/namedev_parse.c @@ -126,7 +126,7 @@ static int namedev_parse(const char *filename, void *data) cur = 0; lineno = 0; while (cur < bufsize) { - int i, j; + unsigned int i, j; count = buf_get_line(buf, bufsize, cur); bufline = &buf[cur]; @@ -195,7 +195,7 @@ int udev_db_get_device_byname(struct udevice *udev, const char *name) memset(&db_udev, 0x00, sizeof(struct udevice)); if (parse_db_file(&db_udev, filename) == 0) { char *pos; - int len; + unsigned int len; if (strncmp(name, db_udev.name, NAME_SIZE) == 0) { goto found; diff --git a/udev_sysfs.c b/udev_sysfs.c index 1b3603df6d..fd7330a161 100644 --- a/udev_sysfs.c +++ b/udev_sysfs.c @@ -211,7 +211,7 @@ static int class_device_expect_no_device_link(struct sysfs_class_device *class_d { NULL, NULL } }; const struct class_device *classdevice; - int len; + unsigned int len; /* the kernel may tell us what to wait for */ if (kernel_release_satisfactory(2,6,10) > 0) |