lkml.org 
[lkml]   [2019]   [Dec]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 275/434] selftests: net: Fix printf format warnings on arm
    Date
    From: Masami Hiramatsu <mhiramat@kernel.org>

    [ Upstream commit 670cd6849ea36ea4df2f2941cf4717dff8755abe ]

    Fix printf format warnings on arm (and other 32bit arch).

    - udpgso.c and udpgso_bench_tx use %lu for size_t but it
    should be unsigned long long on 32bit arch.

    - so_txtime.c uses %ld for int64_t, but it should be
    unsigned long long on 32bit arch.

    Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
    Cc: Willem de Bruijn <willemb@google.com>
    Cc: David S. Miller <davem@davemloft.net>
    Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/testing/selftests/net/so_txtime.c | 4 ++--
    tools/testing/selftests/net/udpgso.c | 3 ++-
    tools/testing/selftests/net/udpgso_bench_tx.c | 3 ++-
    3 files changed, 6 insertions(+), 4 deletions(-)

    diff --git a/tools/testing/selftests/net/so_txtime.c b/tools/testing/selftests/net/so_txtime.c
    index 53f598f06647..34df4c8882af 100644
    --- a/tools/testing/selftests/net/so_txtime.c
    +++ b/tools/testing/selftests/net/so_txtime.c
    @@ -105,8 +105,8 @@ static void do_recv_one(int fdr, struct timed_send *ts)
    tstop = (gettime_ns() - glob_tstart) / 1000;
    texpect = ts->delay_us >= 0 ? ts->delay_us : 0;

    - fprintf(stderr, "payload:%c delay:%ld expected:%ld (us)\n",
    - rbuf[0], tstop, texpect);
    + fprintf(stderr, "payload:%c delay:%lld expected:%lld (us)\n",
    + rbuf[0], (long long)tstop, (long long)texpect);

    if (rbuf[0] != ts->data)
    error(1, 0, "payload mismatch. expected %c", ts->data);
    diff --git a/tools/testing/selftests/net/udpgso.c b/tools/testing/selftests/net/udpgso.c
    index 614b31aad168..c66da6ffd6d8 100644
    --- a/tools/testing/selftests/net/udpgso.c
    +++ b/tools/testing/selftests/net/udpgso.c
    @@ -440,7 +440,8 @@ static bool __send_one(int fd, struct msghdr *msg, int flags)
    if (ret == -1)
    error(1, errno, "sendmsg");
    if (ret != msg->msg_iov->iov_len)
    - error(1, 0, "sendto: %d != %lu", ret, msg->msg_iov->iov_len);
    + error(1, 0, "sendto: %d != %llu", ret,
    + (unsigned long long)msg->msg_iov->iov_len);
    if (msg->msg_flags)
    error(1, 0, "sendmsg: return flags 0x%x\n", msg->msg_flags);

    diff --git a/tools/testing/selftests/net/udpgso_bench_tx.c b/tools/testing/selftests/net/udpgso_bench_tx.c
    index ada99496634a..17512a43885e 100644
    --- a/tools/testing/selftests/net/udpgso_bench_tx.c
    +++ b/tools/testing/selftests/net/udpgso_bench_tx.c
    @@ -405,7 +405,8 @@ static int send_udp_segment(int fd, char *data)
    if (ret == -1)
    error(1, errno, "sendmsg");
    if (ret != iov.iov_len)
    - error(1, 0, "sendmsg: %u != %lu\n", ret, iov.iov_len);
    + error(1, 0, "sendmsg: %u != %llu\n", ret,
    + (unsigned long long)iov.iov_len);

    return 1;
    }
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-29 18:53    [W:3.395 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site