提交 ab125bd3 编写于 作者: N Nathan Chancellor 提交者: Greg Kroah-Hartman

isdn: avm: Fix string plus integer warning from Clang

[ Upstream commit 7afa81c55fca0cad589722cb4bce698b4803b0e1 ]

A recent commit in Clang expanded the -Wstring-plus-int warning, showing
some odd behavior in this file.

drivers/isdn/hardware/avm/b1.c:426:30: warning: adding 'int' to a string does not append to the string [-Wstring-plus-int]
                cinfo->version[j] = "\0\0" + 1;
                                    ~~~~~~~^~~
drivers/isdn/hardware/avm/b1.c:426:30: note: use array indexing to silence this warning
                cinfo->version[j] = "\0\0" + 1;
                                           ^
                                    &      [  ]
1 warning generated.

This is equivalent to just "\0". Nick pointed out that it is smarter to
use "" instead of "\0" because "" is used elsewhere in the kernel and
can be deduplicated at the linking stage.

Link: https://github.com/ClangBuiltLinux/linux/issues/309Suggested-by: NNick Desaulniers <ndesaulniers@google.com>
Signed-off-by: NNathan Chancellor <natechancellor@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
Signed-off-by: NSasha Levin <sashal@kernel.org>
上级 6ed281fd
...@@ -423,7 +423,7 @@ void b1_parse_version(avmctrl_info *cinfo) ...@@ -423,7 +423,7 @@ void b1_parse_version(avmctrl_info *cinfo)
int i, j; int i, j;
for (j = 0; j < AVM_MAXVERSION; j++) for (j = 0; j < AVM_MAXVERSION; j++)
cinfo->version[j] = "\0\0" + 1; cinfo->version[j] = "";
for (i = 0, j = 0; for (i = 0, j = 0;
j < AVM_MAXVERSION && i < cinfo->versionlen; j < AVM_MAXVERSION && i < cinfo->versionlen;
j++, i += cinfo->versionbuf[i] + 1) j++, i += cinfo->versionbuf[i] + 1)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册