summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hw/scsi-disk.c2
-rw-r--r--qemu-char.c6
-rw-r--r--sparc-dis.c1
-rw-r--r--usb-bsd.c12
4 files changed, 10 insertions, 11 deletions
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index 4c4b921d91..744573e0d2 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -821,7 +821,7 @@ SCSIDevice *scsi_disk_init(BlockDriverState *bdrv, int tcq,
strncpy(s->drive_serial_str, drive_get_serial(s->bdrv),
sizeof(s->drive_serial_str));
if (strlen(s->drive_serial_str) == 0)
- strcpy(s->drive_serial_str, "0");
+ pstrcpy(s->drive_serial_str, sizeof(s->drive_serial_str), "0");
d = (SCSIDevice *)qemu_mallocz(sizeof(SCSIDevice));
d->state = s;
d->destroy = scsi_destroy;
diff --git a/qemu-char.c b/qemu-char.c
index 27cdd325a2..bc024e08d9 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -2053,11 +2053,11 @@ static CharDriverState *qemu_chr_open_tcp(const char *host_str,
if (is_listen) {
chr->filename = qemu_malloc(256);
if (is_unix) {
- strcpy(chr->filename, "unix:");
+ pstrcpy(chr->filename, 256, "unix:");
} else if (is_telnet) {
- strcpy(chr->filename, "telnet:");
+ pstrcpy(chr->filename, 256, "telnet:");
} else {
- strcpy(chr->filename, "tcp:");
+ pstrcpy(chr->filename, 256, "tcp:");
}
offset = strlen(chr->filename);
}
diff --git a/sparc-dis.c b/sparc-dis.c
index ae633f2cf9..f88efe66c7 100644
--- a/sparc-dis.c
+++ b/sparc-dis.c
@@ -224,7 +224,6 @@ typedef struct sparc_opcode
#define RS2_G0 RS2 (~0)
static const struct sparc_opcode sparc_opcodes[];
-static const int sparc_num_opcodes;
static const char *sparc_decode_asi_v8 (int);
static const char *sparc_decode_asi_v9 (int);
diff --git a/usb-bsd.c b/usb-bsd.c
index 0e4157c58b..a8a805f064 100644
--- a/usb-bsd.c
+++ b/usb-bsd.c
@@ -178,7 +178,7 @@ static int usb_host_handle_control(USBDevice *dev,
req.ucr_flags = USBD_SHORT_XFER_OK;
ret = ioctl(s->devfd, USB_SET_TIMEOUT, &timeout);
-#if (__NetBSD__ || __OpenBSD__)
+#if defined(__NetBSD__) || defined(__OpenBSD__)
if (ret < 0 && errno != EINVAL) {
#else
if (ret < 0) {
@@ -372,7 +372,7 @@ USBDevice *usb_host_device_open(const char *devname)
"host:%s", devname);
pstrcpy(dev->devpath, sizeof(dev->devpath), "/dev/");
- strcat(dev->devpath, dev_info.udi_devnames[0]);
+ pstrcat(dev->devpath, sizeof(dev->devpath), dev_info.udi_devnames[0]);
/* Mark the endpoints as not yet open */
for (i = 0; i < USB_MAX_ENDPOINTS; i++)
@@ -550,10 +550,10 @@ static const char *usb_class_str(uint8_t class)
return p->class_name;
}
-void usb_info_device(int bus_num, int addr, int class_id,
- int vendor_id, int product_id,
- const char *product_name,
- int speed)
+static void usb_info_device(int bus_num, int addr, int class_id,
+ int vendor_id, int product_id,
+ const char *product_name,
+ int speed)
{
const char *class_str, *speed_str;