vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

ieee1275: fix build regression in of_path_of_nvme

Browse source 
The of_path_of_nvme function (commit 2391d57, ieee1275: add nvme
support within ofpath) introduced a build regression:
    grub-core/osdep/linux/ofpath.c:365:21: error: comparison between pointer
    and zero character constant [-Werror=pointer-compare]
       if ((digit_string != '\0') && (*part_end == 'p'))

Update digit_string to compare against the char instead of the pointer.

Signed-off-by: Joakim Bech <joakim.bech@linaro.org>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Joakim Bech 2018-02-26 09:57:34 +01:00 committed by Vincent Batts
parent 7bc672fbbf
commit 09737b803f
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
grub-core/osdep/linux/ofpath.c
View file

@ -362,7 +362,7 @@ of_path_of_nvme(const char *sys_devname __attribute__((unused)),
digit_string = trailing_digits (device);
part_end = devicenode + strlen (devicenode) - 1;
if ((digit_string != '\0') && (*part_end == 'p'))
if ((*digit_string != '\0') && (*part_end == 'p'))
{
/* We have a partition number, strip it off. */
int part;