| Message ID | 1432721046-4418-9-git-send-email-fziglio@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 27 May 2015 at 20:04, Frediano Ziglio <fziglio@redhat.com> wrote: > Enable format string checks for qxl_io_log and remove resulting warnings > which could lead to memory errors on different platform or just printing > wrong information. > > Signed-off-by: Frediano Ziglio <fziglio@redhat.com> Reviewed-by: Dave Airlie <airlied@redhat.com> > --- > qxl/qxl_cmd.c | 2 +- > qxl/qxl_display.c | 2 +- > qxl/qxl_drv.h | 2 +- > qxl/qxl_release.c | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/qxl/qxl_cmd.c b/qxl/qxl_cmd.c > index b18f84c..edc1eec 100644 > --- a/qxl/qxl_cmd.c > +++ b/qxl/qxl_cmd.c > @@ -248,7 +248,7 @@ int qxl_garbage_collect(struct qxl_device *qdev) > } > } > > - QXL_INFO(qdev, "%s: %lld\n", __func__, i); > + QXL_INFO(qdev, "%s: %d\n", __func__, i); > > return i; > } > diff --git a/qxl/qxl_display.c b/qxl/qxl_display.c > index 4a0a8b2..a8dbb3e 100644 > --- a/qxl/qxl_display.c > +++ b/qxl/qxl_display.c > @@ -67,7 +67,7 @@ static int qxl_display_copy_rom_client_monitors_config(struct qxl_device *qdev) > crc = crc32(0, (const uint8_t *)&qdev->rom->client_monitors_config, > sizeof(qdev->rom->client_monitors_config)); > if (crc != qdev->rom->client_monitors_config_crc) { > - qxl_io_log(qdev, "crc mismatch: have %X (%d) != %X\n", crc, > + qxl_io_log(qdev, "crc mismatch: have %X (%zd) != %X\n", crc, > sizeof(qdev->rom->client_monitors_config), > qdev->rom->client_monitors_config_crc); > return 1; > diff --git a/qxl/qxl_drv.h b/qxl/qxl_drv.h > index 6745c44..62ef8be 100644 > --- a/qxl/qxl_drv.h > +++ b/qxl/qxl_drv.h > @@ -328,7 +328,7 @@ struct qxl_device { > }; > > /* forward declaration for QXL_INFO_IO */ > -void qxl_io_log(struct qxl_device *qdev, const char *fmt, ...); > +__printf(2,3) void qxl_io_log(struct qxl_device *qdev, const char *fmt, ...); > > extern const struct drm_ioctl_desc qxl_ioctls[]; > extern int qxl_max_ioctl; > diff --git a/qxl/qxl_release.c b/qxl/qxl_release.c > index 00604ed..b66ec33 100644 > --- a/qxl/qxl_release.c > +++ b/qxl/qxl_release.c > @@ -153,7 +153,7 @@ qxl_release_alloc(struct qxl_device *qdev, int type, > return handle; > } > *ret = release; > - QXL_INFO(qdev, "allocated release %lld\n", handle); > + QXL_INFO(qdev, "allocated release %d\n", handle); > release->id = handle; > return handle; > } > -- > 2.1.0 > > _______________________________________________ > Spice-devel mailing list > Spice-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/spice-devel
diff --git a/qxl/qxl_cmd.c b/qxl/qxl_cmd.c index b18f84c..edc1eec 100644 --- a/qxl/qxl_cmd.c +++ b/qxl/qxl_cmd.c @@ -248,7 +248,7 @@ int qxl_garbage_collect(struct qxl_device *qdev) } } - QXL_INFO(qdev, "%s: %lld\n", __func__, i); + QXL_INFO(qdev, "%s: %d\n", __func__, i); return i; } diff --git a/qxl/qxl_display.c b/qxl/qxl_display.c index 4a0a8b2..a8dbb3e 100644 --- a/qxl/qxl_display.c +++ b/qxl/qxl_display.c @@ -67,7 +67,7 @@ static int qxl_display_copy_rom_client_monitors_config(struct qxl_device *qdev) crc = crc32(0, (const uint8_t *)&qdev->rom->client_monitors_config, sizeof(qdev->rom->client_monitors_config)); if (crc != qdev->rom->client_monitors_config_crc) { - qxl_io_log(qdev, "crc mismatch: have %X (%d) != %X\n", crc, + qxl_io_log(qdev, "crc mismatch: have %X (%zd) != %X\n", crc, sizeof(qdev->rom->client_monitors_config), qdev->rom->client_monitors_config_crc); return 1; diff --git a/qxl/qxl_drv.h b/qxl/qxl_drv.h index 6745c44..62ef8be 100644 --- a/qxl/qxl_drv.h +++ b/qxl/qxl_drv.h @@ -328,7 +328,7 @@ struct qxl_device { }; /* forward declaration for QXL_INFO_IO */ -void qxl_io_log(struct qxl_device *qdev, const char *fmt, ...); +__printf(2,3) void qxl_io_log(struct qxl_device *qdev, const char *fmt, ...); extern const struct drm_ioctl_desc qxl_ioctls[]; extern int qxl_max_ioctl; diff --git a/qxl/qxl_release.c b/qxl/qxl_release.c index 00604ed..b66ec33 100644 --- a/qxl/qxl_release.c +++ b/qxl/qxl_release.c @@ -153,7 +153,7 @@ qxl_release_alloc(struct qxl_device *qdev, int type, return handle; } *ret = release; - QXL_INFO(qdev, "allocated release %lld\n", handle); + QXL_INFO(qdev, "allocated release %d\n", handle); release->id = handle; return handle; }
Enable format string checks for qxl_io_log and remove resulting warnings which could lead to memory errors on different platform or just printing wrong information. Signed-off-by: Frediano Ziglio <fziglio@redhat.com> --- qxl/qxl_cmd.c | 2 +- qxl/qxl_display.c | 2 +- qxl/qxl_drv.h | 2 +- qxl/qxl_release.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)