[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH PULL 08/10] contrib/rdmacm-mux: remove Wno-format-tr
From: |
Marcel Apfelbaum |
Subject: |
[Qemu-devel] [PATCH PULL 08/10] contrib/rdmacm-mux: remove Wno-format-truncation flag |
Date: |
Sat, 19 Jan 2019 12:03:13 +0200 |
The flag is not recognized by some CLANG versions.
Add proper constraints in code instead.
Reviewed-by: Yuval Shaia <address@hidden>
Tested-by: Cornelia Huck <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Marcel Apfelbaum <address@hidden>
---
contrib/rdmacm-mux/Makefile.objs | 2 +-
contrib/rdmacm-mux/main.c | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/contrib/rdmacm-mux/Makefile.objs b/contrib/rdmacm-mux/Makefile.objs
index be3eacb6f7..e1ff4fe569 100644
--- a/contrib/rdmacm-mux/Makefile.objs
+++ b/contrib/rdmacm-mux/Makefile.objs
@@ -1,4 +1,4 @@
ifdef CONFIG_PVRDMA
-CFLAGS += -libumad -Wno-format-truncation
+CFLAGS += -libumad
rdmacm-mux-obj-y = main.o
endif
diff --git a/contrib/rdmacm-mux/main.c b/contrib/rdmacm-mux/main.c
index 835a7f9214..64676030c5 100644
--- a/contrib/rdmacm-mux/main.c
+++ b/contrib/rdmacm-mux/main.c
@@ -42,6 +42,8 @@
/* The below can be override by command line parameter */
#define UNIX_SOCKET_PATH "/var/run/rdmacm-mux"
+/* Has format %s-%s-%d" <path>-<rdma-dev--name>-<port> */
+#define SOCKET_PATH_MAX (PATH_MAX - NAME_MAX - sizeof(int) - 2)
#define RDMA_PORT_NUM 1
typedef struct RdmaCmServerArgs {
@@ -95,7 +97,7 @@ static void help(const char *progname)
static void parse_args(int argc, char *argv[])
{
int c;
- char unix_socket_path[PATH_MAX];
+ char unix_socket_path[SOCKET_PATH_MAX];
strcpy(server.args.rdma_dev_name, "");
strcpy(unix_socket_path, UNIX_SOCKET_PATH);
@@ -113,7 +115,7 @@ static void parse_args(int argc, char *argv[])
case 's':
/* This is temporary, final name will build below */
- strncpy(unix_socket_path, optarg, PATH_MAX);
+ strncpy(unix_socket_path, optarg, SOCKET_PATH_MAX);
break;
case 'p':
--
2.17.1
- [Qemu-devel] [PATCH PULL 00/10] RDMA queue, Marcel Apfelbaum, 2019/01/19
- [Qemu-devel] [PATCH PULL 01/10] docs/pvrdma: Update rdmacm-mux documentation, Marcel Apfelbaum, 2019/01/19
- [Qemu-devel] [PATCH PULL 09/10] hw/rdma: modify struct initialization, Marcel Apfelbaum, 2019/01/19
- [Qemu-devel] [PATCH PULL 05/10] hw/pvrdma: Make function pvrdma_qp_send/recv return void., Marcel Apfelbaum, 2019/01/19
- [Qemu-devel] [PATCH PULL 07/10] hw: rdma: fix an off-by-one issue, Marcel Apfelbaum, 2019/01/19
- [Qemu-devel] [PATCH PULL 08/10] contrib/rdmacm-mux: remove Wno-format-truncation flag,
Marcel Apfelbaum <=
- [Qemu-devel] [PATCH PULL 06/10] hw/rdma: Verify that ptr is not NULL before freeing, Marcel Apfelbaum, 2019/01/19
- [Qemu-devel] [PATCH PULL 04/10] hw/pvrdma: Post CQE when receive invalid gid index, Marcel Apfelbaum, 2019/01/19
- [Qemu-devel] [PATCH PULL 03/10] hw/rdma: Delete unused struct member, Marcel Apfelbaum, 2019/01/19
- [Qemu-devel] [PATCH PULL 02/10] hw/pvrdma: Remove max-sge command-line param, Marcel Apfelbaum, 2019/01/19
- [Qemu-devel] [PATCH PULL 10/10] contrib/rdmacm-mux: fix clang compilation, Marcel Apfelbaum, 2019/01/19
- Re: [Qemu-devel] [PATCH PULL 00/10] RDMA queue, 李强, 2019/01/20
- Re: [Qemu-devel] [PATCH PULL 00/10] RDMA queue, Peter Maydell, 2019/01/22