len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-10 05:32:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert 1207c7b and fix the actual warnings.

Browse source 
The warnings 1207c7b was supposed to get rid of are sim-only. This
means the binsize argument used for the _FORTIFY_SOURCE fix did not
apply at all. This one actually checks the return values.

Change-Id: Ic4cd8c25de4305310baa868c077a66981cdfcb4b
This commit is contained in:
Frank Gevaerts 2012-04-03 20:59:11 +02:00
parent 1207c7b641
commit 9ca9b657e4
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
firmware/target/hosted/sdl/lcd-charcells.c
View file

@ -167,7 +167,11 @@ void screen_dump(void)
if (fd < 0) if (fd < 0)
return; return;
write(fd, bmpheader, sizeof(bmpheader)); if(write(fd, bmpheader, sizeof(bmpheader)) != sizeof(bmpheader))
{
close(fd);
return;
}
SDL_LockSurface(lcd_surface); SDL_LockSurface(lcd_surface);
/* BMP image goes bottom up */ /* BMP image goes bottom up */
@ -191,7 +195,11 @@ void screen_dump(void)
dst_mask = 0x80; dst_mask = 0x80;
} }
} }
write(fd, line, sizeof(line)); if(write(fd, line, sizeof(line)) != sizeof(line))
{
close(fd);
return;
}
} }
SDL_UnlockSurface(lcd_surface); SDL_UnlockSurface(lcd_surface);
close(fd); close(fd);

2
tools/configure vendored
View file

@ -3827,8 +3827,6 @@ if test -n "$t_cpu"; then
elif [ "$simulator" = "yes" ]; then # a few more includes for the sim target tree elif [ "$simulator" = "yes" ]; then # a few more includes for the sim target tree
TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/hosted/sdl" TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/hosted/sdl"
TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/hosted" TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/hosted"
#disable _FORTIFY_SOURCE for simulator builds
GCCOPTS="$GCCOPTS -U_FORTIFY_SOURCE"
fi fi
TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/$t_cpu/$t_manufacturer" TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/$t_cpu/$t_manufacturer"