Don't use %L width specifier with integer values
Subsystems (2)
PATCH v2 1/1 Don't use %L width specifier with integer values
From: Philip Prindeville <[email protected]>
MUSL doesn't support %L except for floating-point arguments; therefore, %ll must be used instead with integer arguments.
--- kexec/arch/arm/kexec-arm.c | 2 +- kexec/arch/i386/crashdump-x86.c | 8 ++++---- kexec/arch/i386/kexec-x86-common.c | 2 +- kexec/arch/ia64/kexec-elf-rel-ia64.c | 2 +- kexec/arch/mips/crashdump-mips.c | 2 +- kexec/arch/mips/kexec-mips.c | 2 +- kexec/arch/s390/kexec-s390.c | 2 +- kexec/crashdump.c | 8 ++++---- kexec/kexec-iomem.c | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-)
kexec/arch/arm/kexec-arm.c +1 -1
@@ -47,7 +47,7 @@ int get_memory_ranges(struct memory_range **range, int *ranges,int count;if (memory_ranges >=MAX_MEMORY_RANGES )break ; - count =sscanf (line,"%Lx-%Lx : %n" , + count =sscanf (line,"%llx-%llx : %n" , &start, &end, &consumed);if (count !=2 )continue ;
kexec/arch/i386/crashdump-x86.c +4 -4
@@ -119,7 +119,7 @@ static unsigned long long get_kernel_sym(const char *symbol) }while (fgets (line,sizeof (line), fp) !=NULL ) { -if (sscanf (line,"%Lx %c %s" , &vaddr, &type, sym) !=3 ) +if (sscanf (line,"%llx %c %s" , &vaddr, &type, sym) !=3 )continue ;if (strcmp (sym, symbol) ==0 ) {dbgprintf ("kernel symbol %s vaddr = %16llx\n" , symbol, vaddr);
@@ -296,12 +296,12 @@ static int get_crash_memory_ranges(struct memory_range **range, int *ranges,if (memory_ranges >=CRASH_MAX_MEMORY_RANGES )break ; - count =sscanf (line,"%Lx-%Lx : %n" , + count =sscanf (line,"%llx-%llx : %n" , &start, &end, &consumed);if (count !=2 )continue ; str = line + consumed; -dbgprintf ("%016Lx-%016Lx : %s" , +dbgprintf ("%016llx-%016llx : %s" , start, end, str);/* Only Dumping memory of type System RAM. */ if (memcmp (str,"System RAM\n" ,11 ) ==0 ) {
@@ -778,7 +778,7 @@ static int get_crash_notes(int cpu, uint64_t *addr, uint64_t *len) *addr =x86__pa (vaddr + (cpu *MAX_NOTE_BYTES )); *len =MAX_NOTE_BYTES ; -dbgprintf ("crash_notes addr = %Lx\n" , +dbgprintf ("crash_notes addr = %llx\n" , (unsigned long long )*addr);fclose (fp);
kexec/arch/i386/kexec-x86-common.c +1 -1
@@ -81,7 +81,7 @@ static int get_memory_ranges_proc_iomem(struct memory_range **range, int *rangesint count;if (memory_ranges >=MAX_MEMORY_RANGES )break ; - count =sscanf (line,"%Lx-%Lx : %n" , + count =sscanf (line,"%llx-%llx : %n" , &start, &end, &consumed);if (count !=2 )continue ;
kexec/arch/ia64/kexec-elf-rel-ia64.c +1 -1
@@ -155,6 +155,6 @@ void machine_apply_elf_rel(struct mem_ehdr *ehdr, }return ; overflow: -die ("overflow in relocation type %lu val %Lx\n" , +die ("overflow in relocation type %lu val %llx\n" , r_type, value); }
kexec/arch/mips/crashdump-mips.c +1 -1
@@ -173,7 +173,7 @@ static int get_crash_memory_ranges(struct memory_range **range, int *ranges)int type, consumed, count;if (memory_ranges >=CRASH_MAX_MEMORY_RANGES )break ; - count =sscanf (line,"%Lx-%Lx : %n" , + count =sscanf (line,"%llx-%llx : %n" , &start, &end, &consumed);if (count !=2 )continue ;
kexec/arch/mips/kexec-mips.c +1 -1
@@ -48,7 +48,7 @@ int get_memory_ranges(struct memory_range **range, int *ranges,while (fgets (line,sizeof (line), fp) !=0 ) {if (memory_ranges >=MAX_MEMORY_RANGES )break ; - count =sscanf (line,"%Lx-%Lx : %n" , &start, &end, &consumed); + count =sscanf (line,"%llx-%llx : %n" , &start, &end, &consumed);if (count !=2 )continue ; str = line + consumed;
kexec/arch/s390/kexec-s390.c +1 -1
@@ -170,7 +170,7 @@ int get_memory_ranges_s390(struct memory_range memory_range[], int *ranges,if (current_range ==MAX_MEMORY_RANGES )break ; -sscanf (line,"%Lx-%Lx : %n" , &start, &end, &cons); +sscanf (line,"%llx-%llx : %n" , &start, &end, &cons); str = line+cons; if ((memcmp(str, sys_ram, strlen(sys_ram)) == 0) || ((memcmp(str, crash_kernel, strlen(crash_kernel)) == 0) &&
kexec/crashdump.c +4 -4
@@ -98,7 +98,7 @@ int get_crash_notes_per_cpu(int cpu, uint64_t *addr, uint64_t *len) }if (!fgets (line,sizeof (line), fp))die ("Cannot parse %s: %s\n" , crash_notes,strerror (errno)); - count =sscanf (line,"%Lx" , &temp); + count =sscanf (line,"%llx" , &temp);if (count !=1 )die ("Cannot parse %s: %s\n" , crash_notes,strerror (errno)); *addr = (uint64_t ) temp;
@@ -112,7 +112,7 @@ int get_crash_notes_per_cpu(int cpu, uint64_t *addr, uint64_t *len)if (!fgets (line,sizeof (line), fp))die ("Cannot parse %s: %s\n" , crash_notes_size,strerror (errno)); - count =sscanf (line,"%Lu" , &temp); + count =sscanf (line,"%llu" , &temp);if (count !=1 )die ("Cannot parse %s: %s\n" , crash_notes_size,strerror (errno));
@@ -120,7 +120,7 @@ int get_crash_notes_per_cpu(int cpu, uint64_t *addr, uint64_t *len)fclose (fp); } -dbgprintf ("%s: crash_notes addr = %Lx, size = %Lu\n" , __FUNCTION__, +dbgprintf ("%s: crash_notes addr = %llx, size = %llu\n" , __FUNCTION__, (unsigned long long )*addr, (unsigned long long )*len);return 0 ;
@@ -141,7 +141,7 @@ static int get_vmcoreinfo(const char *kdump_info, uint64_t *addr, uint64_t *len)if (!fgets (line,sizeof (line), fp))die ("Cannot parse %s: %s\n" , kdump_info,strerror (errno)); - count =sscanf (line,"%Lx %Lx" , &temp, &temp2); + count =sscanf (line,"%llx %llx" , &temp, &temp2);if (count !=2 )die ("Cannot parse %s: %s\n" , kdump_info,strerror (errno));
kexec/kexec-iomem.c +1 -1
@@ -44,7 +44,7 @@ int kexec_iomem_for_each_line(char *match,die ("Cannot open %s\n" , iomem);while (fgets (line,sizeof (line), fp) !=0 ) { - count =sscanf (line,"%Lx-%Lx : %n" , &start, &end, &consumed); + count =sscanf (line,"%llx-%llx : %n" , &start, &end, &consumed);if (count !=2 )continue ; str = line + consumed;
Signature · 7 lines
2.9.3 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
Quoted 4 lines · Philip Prindeville
From: Philip Prindeville <[email protected]>
MUSL doesn't support %L except for floating-point arguments; therefore, %ll must be used instead with integer arguments.
I apologise for my ignorance; what is MUSL?
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Quoted 10 lines · Simon Horman
Quoted 4 lines · Philip Prindeville
From: Philip Prindeville <[email protected]>
MUSL doesn't support %L except for floating-point arguments; therefore, %ll must be used instead with integer arguments.
I apologise for my ignorance; what is MUSL?
It’s another C run-time library (like eglibc or uClibc) which is optimized for embedded systems.
-Philip
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Quoted 6 lines · Philip Prindeville
Quoted 6 lines · Simon Horman
Quoted 2 lines · Philip Prindeville
From: Philip Prindeville <[email protected]>
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
MUSL doesn't support %L except for floating-point arguments; therefore, %ll must be used instead with integer arguments.
I apologise for my ignorance; what is MUSL?
It’s another C run-time library (like eglibc or uClibc) which is optimized for embedded systems.
Thanks for the clarification.
I have applied your patch.
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec