]> granicus.if.org Git - strace/commitdiff
block.c: change type of long long fileds to int64_t
authorDmitry V. Levin <ldv@altlinux.org>
Mon, 19 Dec 2016 15:59:47 +0000 (15:59 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Mon, 19 Dec 2016 19:58:16 +0000 (19:58 +0000)
* block.c (struct_blkpg_partition): Change type of start and length
fields from long long to int64_t.
(print_blkpg_req): Print them using PRId64 format.

block.c

diff --git a/block.c b/block.c
index 6dd62d68d084dfb8bed62cf99ee44ed10c112660..e566f8cfe15c60a5840aea48b70eeaad1c98a2f4 100644 (file)
--- a/block.c
+++ b/block.c
@@ -45,8 +45,8 @@ typedef struct {
 #define BLKPG_DEVNAMELTH       64
 #define BLKPG_VOLNAMELTH       64
 typedef struct {
-       long long start;                /* starting offset in bytes */
-       long long length;               /* length in bytes */
+       int64_t start;                  /* starting offset in bytes */
+       int64_t length;                 /* length in bytes */
        int pno;                        /* partition number */
        char devname[BLKPG_DEVNAMELTH]; /* partition name, like sda5 or c0d1p2,
                                           to be used in kernel messages */
@@ -130,8 +130,9 @@ print_blkpg_req(struct tcb *tcp, const struct_blkpg_ioctl_arg *blkpg)
                blkpg->flags, blkpg->datalen);
 
        if (!umove_or_printaddr(tcp, (long) blkpg->data, &p)) {
-               tprintf("{start=%lld, length=%lld, pno=%d, devname=",
-                       (long long) p.start, (long long) p.length, p.pno);
+               tprintf("{start=%" PRId64 ", length=%" PRId64
+                       ", pno=%d, devname=",
+                       p.start, p.length, p.pno);
                print_quoted_string(p.devname, sizeof(p.devname),
                                    QUOTE_0_TERMINATED);
                tprints(", volname=");