Skip to contentSkip to conversation

isdn: avm: Fix string plus integer warning from Clang

PATCH Superseded Nathan Chancellor 3 participants 6 messages Jan 8, 2019 – Jan 19, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 isdn: avm: Fix string plus integer warning from Clang

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" so fix it to clean up the warning.

---
 drivers/isdn/hardware/avm/b1.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/isdn/hardware/avm/b1.c +1 -1
index 4ac378e48902..7fa8141e2019 100644
@@ -423,7 +423,7 @@ void b1_parse_version(avmctrl_info *cinfo)
 	int i, j;
 
 	for (j = 0; j < AVM_MAXVERSION; j++)
-		cinfo->version[j] = "\0\0" + 1;
+		cinfo->version[j] = "\0";
 	for (i = 0, j = 0;
 	     j < AVM_MAXVERSION && i < cinfo->versionlen;
 	     j++, i += cinfo->versionbuf[i] + 1)
Signature · 1 line
2.20.1
#1 lore raw
Quoted 11 lines · Nathan Chancellor

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;
                                           ^
                                    &      [  ]
Quoted 3 lines

1 warning generated.

This is equivalent to just "\0" so fix it to clean up the warning.

Hard to tell what the intent of this was. I also assume that they meant to set all version strings to the empty string. I think just = "" would be better, as otherwise that creates a new data section containing two zero bytes vs the empty string which already probably exists throughout the kernel and can be deduplicated by the linker.
https://godbolt.org/z/qf3Rn8
Sorry I gave the quick LGTM in
https://github.com/ClangBuiltLinux/linux/issues/309#issuecomment-452106468,
that was my mistake. Assuming there's no other comments (maybe from the maintainers) on what the intent of this code actually is, would you mind sending a V2? (Sorry again for the quick LGTM on this version).

Quoted 23 lines
---
 drivers/isdn/hardware/avm/b1.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/isdn/hardware/avm/b1.c +1 -2
index 4ac378e48902..7fa8141e2019 100644
@@ -423,7 +423,7 @@ void b1_parse_version(avmctrl_info *cinfo)
        int i, j;
 
        for (j = 0; j < AVM_MAXVERSION; j++)
-               cinfo->version[j] = "\0\0" + 1;
+               cinfo->version[j] = "\0";
        for (i = 0, j = 0;
             j < AVM_MAXVERSION && i < cinfo->versionlen;
             j++, i += cinfo->versionbuf[i] + 1)
--

2.20.1

Signature · 2 lines
Thanks,
~Nick Desaulniers
#2 lore raw
Quoted 17 lines · Nick Desaulniers
Quoted 11 lines · Nathan Chancellor

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;
                                           ^
                                    &      [  ]
Quoted 3 lines

1 warning generated.

This is equivalent to just "\0" so fix it to clean up the warning.

Quoted 12 lines

Hard to tell what the intent of this was. I also assume that they meant to set all version strings to the empty string. I think just = "" would be better, as otherwise that creates a new data section containing two zero bytes vs the empty string which already probably exists throughout the kernel and can be deduplicated by the linker.
https://godbolt.org/z/qf3Rn8
Sorry I gave the quick LGTM in
https://github.com/ClangBuiltLinux/linux/issues/309#issuecomment-452106468,
that was my mistake. Assuming there's no other comments (maybe from the maintainers) on what the intent of this code actually is, would you mind sending a V2? (Sorry again for the quick LGTM on this version).

Of course, thank you for the explanation and further exploration. I'll send a v2 later today/tomorrow to give some time for the maintainers to chime in.

Quoted 29 lines
Quoted 24 lines
---
 drivers/isdn/hardware/avm/b1.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/isdn/hardware/avm/b1.c +1 -2
index 4ac378e48902..7fa8141e2019 100644
@@ -423,7 +423,7 @@ void b1_parse_version(avmctrl_info *cinfo)
        int i, j;
 
        for (j = 0; j < AVM_MAXVERSION; j++)
-               cinfo->version[j] = "\0\0" + 1;
+               cinfo->version[j] = "\0";
        for (i = 0, j = 0;
             j < AVM_MAXVERSION && i < cinfo->versionlen;
             j++, i += cinfo->versionbuf[i] + 1)
--

2.20.1

Signature · 2 lines
Thanks,
~Nick Desaulniers
#3 lore raw

PATCH v2 1/1 isdn: avm: Fix string plus integer warning from Clang

In reply to Nathan Chancellor

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.

---

v1 -> v2:

* Use "" instead of "\0", as they are equivalent, but "" can be deduplicated by the linker, as pointed out by Nick.

 drivers/isdn/hardware/avm/b1.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/isdn/hardware/avm/b1.c +1 -1
index 4ac378e48902..40ca1e8fa09f 100644
@@ -423,7 +423,7 @@ void b1_parse_version(avmctrl_info *cinfo)
 	int i, j;
 
 	for (j = 0; j < AVM_MAXVERSION; j++)
-		cinfo->version[j] = "\0\0" + 1;
+		cinfo->version[j] = "";
 	for (i = 0, j = 0;
 	     j < AVM_MAXVERSION && i < cinfo->versionlen;
 	     j++, i += cinfo->versionbuf[i] + 1)
Signature · 1 line
2.20.1
#4 lore raw
Quoted 11 lines · Nathan Chancellor

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;
                                           ^
                                    &      [  ]
Quoted 8 lines

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.

Thanks for sending the v2. I'll leave review to the maintainers to confirm my suspicions about the code's intent.

Quoted 27 lines

---

v1 -> v2:

* Use "" instead of "\0", as they are equivalent, but "" can be deduplicated by the linker, as pointed out by Nick.

 drivers/isdn/hardware/avm/b1.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/isdn/hardware/avm/b1.c +1 -2
index 4ac378e48902..40ca1e8fa09f 100644
@@ -423,7 +423,7 @@ void b1_parse_version(avmctrl_info *cinfo)
        int i, j;
 
        for (j = 0; j < AVM_MAXVERSION; j++)
-               cinfo->version[j] = "\0\0" + 1;
+               cinfo->version[j] = "";
        for (i = 0, j = 0;
             j < AVM_MAXVERSION && i < cinfo->versionlen;
             j++, i += cinfo->versionbuf[i] + 1)
--

2.20.1

Signature · 2 lines
Thanks,
~Nick Desaulniers
maintainer Applied
#5 lore raw
In reply to Nathan Chancellor

From: Nathan Chancellor <[email protected]>
Date: Wed, 9 Jan 2019 22:41:08 -0700

Quoted 19 lines

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.

Quoted 6 lines

---

v1 -> v2:

* Use "" instead of "\0", as they are equivalent, but "" can be deduplicated by the linker, as pointed out by Nick.

Applied, that was certainly a funny construct....

It obviously is trying to initialize the array elements to pointers to empty strings.