From 0fbd9725274609360d9c7c41846d62146fea6a32 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sun, 2 Nov 2008 21:52:46 +0000 Subject: [PATCH] Use %z for printing size_t/ssize_t. --- lib/libradius/radlib.c | 4 ++-- sbin/mount_msdos/mount_msdos.c | 14 +++++++------- sbin/mount_ntfs/mount_ntfs.c | 14 +++++++------- usr.sbin/rtsold/rtsol.c | 4 ++-- usr.sbin/vidcontrol/vidcontrol.c | 6 +++--- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/lib/libradius/radlib.c b/lib/libradius/radlib.c index 2f5eeba9ec..e2fff0f9a9 100644 --- a/lib/libradius/radlib.c +++ b/lib/libradius/radlib.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libradius/radlib.c,v 1.4.2.3 2002/06/17 02:24:57 brian Exp $ - * $DragonFly: src/lib/libradius/radlib.c,v 1.4 2005/04/20 20:45:57 joerg Exp $ + * $DragonFly: src/lib/libradius/radlib.c,v 1.5 2008/11/02 21:52:46 swildner Exp $ */ #include @@ -901,7 +901,7 @@ rad_put_vendor_attr(struct rad_handle *h, int vendor, int type, int res; if ((attr = malloc(len + 6)) == NULL) { - generr(h, "malloc failure (%d bytes)", len + 6); + generr(h, "malloc failure (%zu bytes)", len + 6); return -1; } diff --git a/sbin/mount_msdos/mount_msdos.c b/sbin/mount_msdos/mount_msdos.c index fedb6c813b..9a0b4a3653 100644 --- a/sbin/mount_msdos/mount_msdos.c +++ b/sbin/mount_msdos/mount_msdos.c @@ -30,7 +30,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sbin/mount_msdos/mount_msdos.c,v 1.19.2.1 2000/07/20 10:35:13 kris Exp $ - * $DragonFly: src/sbin/mount_msdos/mount_msdos.c,v 1.7 2005/04/02 21:41:06 dillon Exp $ + * $DragonFly: src/sbin/mount_msdos/mount_msdos.c,v 1.8 2008/11/02 21:52:46 swildner Exp $ */ #include @@ -272,13 +272,13 @@ load_u2wtable (struct msdosfs_args *pargs, char *name) do { if (p != NULL) free(p); if ((p = s = fparseln(f, NULL, &line, NULL, 0)) == NULL) - errx(EX_DATAERR, "can't read u2w table row %d near line %d", i, line); + errx(EX_DATAERR, "can't read u2w table row %d near line %zu", i, line); while (isspace((unsigned char)*s)) s++; } while (*s == '\0'); if (sscanf(s, "%i%i%i%i%i%i%i%i", code, code + 1, code + 2, code + 3, code + 4, code + 5, code + 6, code + 7) != 8) - errx(EX_DATAERR, "u2w table: missing item(s) in row %d, line %d", i, line); + errx(EX_DATAERR, "u2w table: missing item(s) in row %d, line %zu", i, line); for (j = 0; j < 8; j++) pargs->u2w[i * 8 + j] = code[j]; } @@ -286,13 +286,13 @@ code, code + 1, code + 2, code + 3, code + 4, code + 5, code + 6, code + 7) != 8 do { free(p); if ((p = s = fparseln(f, NULL, &line, NULL, 0)) == NULL) - errx(EX_DATAERR, "can't read d2u table row %d near line %d", i, line); + errx(EX_DATAERR, "can't read d2u table row %d near line %zu", i, line); while (isspace((unsigned char)*s)) s++; } while (*s == '\0'); if (sscanf(s, "%i%i%i%i%i%i%i%i", code, code + 1, code + 2, code + 3, code + 4, code + 5, code + 6, code + 7) != 8) - errx(EX_DATAERR, "d2u table: missing item(s) in row %d, line %d", i, line); + errx(EX_DATAERR, "d2u table: missing item(s) in row %d, line %zu", i, line); for (j = 0; j < 8; j++) pargs->d2u[i * 8 + j] = code[j]; } @@ -300,13 +300,13 @@ code, code + 1, code + 2, code + 3, code + 4, code + 5, code + 6, code + 7) != 8 do { free(p); if ((p = s = fparseln(f, NULL, &line, NULL, 0)) == NULL) - errx(EX_DATAERR, "can't read u2d table row %d near line %d", i, line); + errx(EX_DATAERR, "can't read u2d table row %d near line %zu", i, line); while (isspace((unsigned char)*s)) s++; } while (*s == '\0'); if (sscanf(s, "%i%i%i%i%i%i%i%i", code, code + 1, code + 2, code + 3, code + 4, code + 5, code + 6, code + 7) != 8) - errx(EX_DATAERR, "u2d table: missing item(s) in row %d, line %d", i, line); + errx(EX_DATAERR, "u2d table: missing item(s) in row %d, line %zu", i, line); for (j = 0; j < 8; j++) pargs->u2d[i * 8 + j] = code[j]; } diff --git a/sbin/mount_ntfs/mount_ntfs.c b/sbin/mount_ntfs/mount_ntfs.c index 0c663b127d..3b99e4a440 100644 --- a/sbin/mount_ntfs/mount_ntfs.c +++ b/sbin/mount_ntfs/mount_ntfs.c @@ -29,7 +29,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sbin/mount_ntfs/mount_ntfs.c,v 1.3.2.2 2001/10/12 22:08:43 semenu Exp $ - * $DragonFly: src/sbin/mount_ntfs/mount_ntfs.c,v 1.8 2005/04/03 15:52:40 joerg Exp $ + * $DragonFly: src/sbin/mount_ntfs/mount_ntfs.c,v 1.9 2008/11/02 21:52:46 swildner Exp $ * */ @@ -263,13 +263,13 @@ load_u2wtable (struct ntfs_args *pargs, char *name) do { if (p != NULL) free(p); if ((p = s = fparseln(f, NULL, &line, NULL, 0)) == NULL) - errx(EX_DATAERR, "can't read u2w table row %d near line %d", i, line); + errx(EX_DATAERR, "can't read u2w table row %d near line %zu", i, line); while (isspace((unsigned char)*s)) s++; } while (*s == '\0'); if (sscanf(s, "%i%i%i%i%i%i%i%i", code, code + 1, code + 2, code + 3, code + 4, code + 5, code + 6, code + 7) != 8) - errx(EX_DATAERR, "u2w table: missing item(s) in row %d, line %d", i, line); + errx(EX_DATAERR, "u2w table: missing item(s) in row %d, line %zu", i, line); for (j = 0; j < 8; j++) pargs->u2w[i * 8 + j] = code[j]; } @@ -277,13 +277,13 @@ code, code + 1, code + 2, code + 3, code + 4, code + 5, code + 6, code + 7) != 8 do { free(p); if ((p = s = fparseln(f, NULL, &line, NULL, 0)) == NULL) - errx(EX_DATAERR, "can't read d2u table row %d near line %d", i, line); + errx(EX_DATAERR, "can't read d2u table row %d near line %zu", i, line); while (isspace((unsigned char)*s)) s++; } while (*s == '\0'); if (sscanf(s, "%i%i%i%i%i%i%i%i", code, code + 1, code + 2, code + 3, code + 4, code + 5, code + 6, code + 7) != 8) - errx(EX_DATAERR, "d2u table: missing item(s) in row %d, line %d", i, line); + errx(EX_DATAERR, "d2u table: missing item(s) in row %d, line %zu", i, line); for (j = 0; j < 8; j++) /* pargs->d2u[i * 8 + j] = code[j] */; } @@ -291,13 +291,13 @@ code, code + 1, code + 2, code + 3, code + 4, code + 5, code + 6, code + 7) != 8 do { free(p); if ((p = s = fparseln(f, NULL, &line, NULL, 0)) == NULL) - errx(EX_DATAERR, "can't read u2d table row %d near line %d", i, line); + errx(EX_DATAERR, "can't read u2d table row %d near line %zu", i, line); while (isspace((unsigned char)*s)) s++; } while (*s == '\0'); if (sscanf(s, "%i%i%i%i%i%i%i%i", code, code + 1, code + 2, code + 3, code + 4, code + 5, code + 6, code + 7) != 8) - errx(EX_DATAERR, "u2d table: missing item(s) in row %d, line %d", i, line); + errx(EX_DATAERR, "u2d table: missing item(s) in row %d, line %zu", i, line); for (j = 0; j < 8; j++) /* pargs->u2d[i * 8 + j] = code[j] */; } diff --git a/usr.sbin/rtsold/rtsol.c b/usr.sbin/rtsold/rtsol.c index 291b3a80f4..74c2398bd6 100644 --- a/usr.sbin/rtsold/rtsol.c +++ b/usr.sbin/rtsold/rtsol.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/rtsold/rtsol.c,v 1.1.2.4 2002/04/24 10:22:30 suz Exp $ - * $DragonFly: src/usr.sbin/rtsold/rtsol.c,v 1.6 2006/10/17 19:20:49 pavalos Exp $ + * $DragonFly: src/usr.sbin/rtsold/rtsol.c,v 1.7 2008/11/02 21:52:46 swildner Exp $ */ #include @@ -278,7 +278,7 @@ rtsol_input(int s) if ((size_t)i < sizeof(struct nd_router_advert)) { warnmsg(LOG_ERR, - __func__, "packet size(%d) is too short", i); + __func__, "packet size(%zd) is too short", i); return; } diff --git a/usr.sbin/vidcontrol/vidcontrol.c b/usr.sbin/vidcontrol/vidcontrol.c index c84949b187..682701e12e 100644 --- a/usr.sbin/vidcontrol/vidcontrol.c +++ b/usr.sbin/vidcontrol/vidcontrol.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/vidcontrol/vidcontrol.c,v 1.32.2.7 2002/09/15 22:31:50 dd Exp $ - * $DragonFly: src/usr.sbin/vidcontrol/vidcontrol.c,v 1.14 2008/07/07 23:03:25 swildner Exp $ + * $DragonFly: src/usr.sbin/vidcontrol/vidcontrol.c,v 1.15 2008/11/02 21:52:46 swildner Exp $ */ #include @@ -888,9 +888,9 @@ show_adapter_info(void) adapter_name(ad.va_type), ad.va_type, ad.va_flags); printf(" initial mode:%d, current mode:%d, BIOS mode:%d\n", ad.va_initial_mode, ad.va_mode, ad.va_initial_bios_mode); - printf(" frame buffer window:0x%x, buffer size:0x%x\n", + printf(" frame buffer window:0x%x, buffer size:0x%zx\n", ad.va_window, ad.va_buffer_size); - printf(" window size:0x%x, origin:0x%x\n", + printf(" window size:0x%zx, origin:0x%x\n", ad.va_window_size, ad.va_window_orig); printf(" display start address (%d, %d), scan line width:%d\n", ad.va_disp_start.x, ad.va_disp_start.y, ad.va_line_width); -- 2.41.0