diff options
| author | Chuhong Yuan <hslester96@gmail.com> | 2019-07-30 11:02:39 +0800 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2020-06-12 17:43:17 -0700 |
| commit | 5f14596e55de458987ee38043019b3d5cd636af1 (patch) | |
| tree | a00ed0e15cdef3dea659cac659d95c2ae30e2ccc | |
| parent | 5bea3044a74acb3d780288c0fecd0eb25bdda24d (diff) | |
| download | usb-5f14596e55de458987ee38043019b3d5cd636af1.tar.gz | |
alpha: Replace strncmp with str_has_prefix
In commit b6b2735514bc
("tracing: Use str_has_prefix() instead of using fixed sizes")
the newly introduced str_has_prefix() was used
to replace error-prone strncmp(str, const, len).
Here fix codes with the same pattern.
Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
| -rw-r--r-- | arch/alpha/boot/tools/objstrip.c | 2 | ||||
| -rw-r--r-- | arch/alpha/kernel/setup.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/alpha/boot/tools/objstrip.c b/arch/alpha/boot/tools/objstrip.c index 825a16f5f62246..08b430d25a315f 100644 --- a/arch/alpha/boot/tools/objstrip.c +++ b/arch/alpha/boot/tools/objstrip.c @@ -148,7 +148,7 @@ main (int argc, char *argv[]) #ifdef __ELF__ elf = (struct elfhdr *) buf; - if (elf->e_ident[0] == 0x7f && strncmp((char *)elf->e_ident + 1, "ELF", 3) == 0) { + if (elf->e_ident[0] == 0x7f && str_has_prefix((char *)elf->e_ident + 1, "ELF")) { if (elf->e_type != ET_EXEC) { fprintf(stderr, "%s: %s is not an ELF executable\n", prog_name, inname); diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c index c3934ef703d8fa..d1fba112bdb4f5 100644 --- a/arch/alpha/kernel/setup.c +++ b/arch/alpha/kernel/setup.c @@ -474,7 +474,7 @@ setup_arch(char **cmdline_p) #ifndef alpha_using_srm /* Assume that we've booted from SRM if we haven't booted from MILO. Detect the later by looking for "MILO" in the system serial nr. */ - alpha_using_srm = strncmp((const char *)hwrpb->ssn, "MILO", 4) != 0; + alpha_using_srm = !str_has_prefix((const char *)hwrpb->ssn, "MILO"); #endif #ifndef alpha_using_qemu /* Similarly, look for QEMU. */ |