Message ID | 20220321102546.12569-1-guozhengkui@vivo.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 1585b1b55a2b9086823a6b30031eb63f965f8d44 |
Headers | show |
Series | [linux-next] selftests/proc: fix array_size.cocci warning | expand |
On 3/21/22 4:25 AM, Guo Zhengkui wrote: > Fix the following coccicheck warning: > > tools/testing/selftests/proc/proc-pid-vm.c:371:26-27: > WARNING: Use ARRAY_SIZE > tools/testing/selftests/proc/proc-pid-vm.c:420:26-27: > WARNING: Use ARRAY_SIZE > > It has been tested with gcc (Debian 8.3.0-6) 8.3.0 on x86_64. > > Signed-off-by: Guo Zhengkui <guozhengkui@vivo.com> > --- > tools/testing/selftests/proc/proc-pid-vm.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/tools/testing/selftests/proc/proc-pid-vm.c b/tools/testing/selftests/proc/proc-pid-vm.c > index 18a3bde8bc96..28604c9f805c 100644 > --- a/tools/testing/selftests/proc/proc-pid-vm.c > +++ b/tools/testing/selftests/proc/proc-pid-vm.c > @@ -46,6 +46,8 @@ > #include <sys/time.h> > #include <sys/resource.h> > > +#include "../kselftest.h" > + > static inline long sys_execveat(int dirfd, const char *pathname, char **argv, char **envp, int flags) > { > return syscall(SYS_execveat, dirfd, pathname, argv, envp, flags); > @@ -368,7 +370,7 @@ int main(void) > }; > int i; > > - for (i = 0; i < sizeof(S)/sizeof(S[0]); i++) { > + for (i = 0; i < ARRAY_SIZE(S); i++) { > assert(memmem(buf, rv, S[i], strlen(S[i]))); > } > > @@ -417,7 +419,7 @@ int main(void) > }; > int i; > > - for (i = 0; i < sizeof(S)/sizeof(S[0]); i++) { > + for (i = 0; i < ARRAY_SIZE(S); i++) { > assert(memmem(buf, rv, S[i], strlen(S[i]))); > } > } > Looks good to me. I will apply this once merge window closes. thanks, -- Shuah
diff --git a/tools/testing/selftests/proc/proc-pid-vm.c b/tools/testing/selftests/proc/proc-pid-vm.c index 18a3bde8bc96..28604c9f805c 100644 --- a/tools/testing/selftests/proc/proc-pid-vm.c +++ b/tools/testing/selftests/proc/proc-pid-vm.c @@ -46,6 +46,8 @@ #include <sys/time.h> #include <sys/resource.h> +#include "../kselftest.h" + static inline long sys_execveat(int dirfd, const char *pathname, char **argv, char **envp, int flags) { return syscall(SYS_execveat, dirfd, pathname, argv, envp, flags); @@ -368,7 +370,7 @@ int main(void) }; int i; - for (i = 0; i < sizeof(S)/sizeof(S[0]); i++) { + for (i = 0; i < ARRAY_SIZE(S); i++) { assert(memmem(buf, rv, S[i], strlen(S[i]))); } @@ -417,7 +419,7 @@ int main(void) }; int i; - for (i = 0; i < sizeof(S)/sizeof(S[0]); i++) { + for (i = 0; i < ARRAY_SIZE(S); i++) { assert(memmem(buf, rv, S[i], strlen(S[i]))); } }
Fix the following coccicheck warning: tools/testing/selftests/proc/proc-pid-vm.c:371:26-27: WARNING: Use ARRAY_SIZE tools/testing/selftests/proc/proc-pid-vm.c:420:26-27: WARNING: Use ARRAY_SIZE It has been tested with gcc (Debian 8.3.0-6) 8.3.0 on x86_64. Signed-off-by: Guo Zhengkui <guozhengkui@vivo.com> --- tools/testing/selftests/proc/proc-pid-vm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)