Fix some cppcheck variableScope warnings

This commit is contained in:
Chris Young 2014-04-05 19:46:36 +01:00
parent f991abc53c
commit c2f9a39966

View File

@ -547,7 +547,6 @@ static void ami_set_screen_defaults(struct Screen *screen)
static nserror ami_set_options(struct nsoption_s *defaults) static nserror ami_set_options(struct nsoption_s *defaults)
{ {
STRPTR tempacceptlangs; STRPTR tempacceptlangs;
BPTR lock = 0;
char temp[1024]; char temp[1024];
/* The following line disables the popupmenu.class select menu /* The following line disables the popupmenu.class select menu
@ -605,15 +604,16 @@ static nserror ami_set_options(struct nsoption_s *defaults)
if (nsoption_charp(font_unicode) == NULL) if (nsoption_charp(font_unicode) == NULL)
{ {
BPTR lock = 0;
/* Search for some likely candidates */ /* Search for some likely candidates */
if(lock=Lock("FONTS:Code2000.font",ACCESS_READ)) if(lock = Lock("FONTS:Code2000.font", ACCESS_READ))
{ {
UnLock(lock); UnLock(lock);
nsoption_set_charp(font_unicode, nsoption_set_charp(font_unicode,
(char *)strdup("Code2000")); (char *)strdup("Code2000"));
} }
else if(lock=Lock("FONTS:Bitstream Cyberbit.font",ACCESS_READ)) else if(lock = Lock("FONTS:Bitstream Cyberbit.font", ACCESS_READ))
{ {
UnLock(lock); UnLock(lock);
nsoption_set_charp(font_unicode, nsoption_set_charp(font_unicode,
@ -637,7 +637,7 @@ void ami_amiupdate(void)
{ {
/* Create AppPath location for AmiUpdate use */ /* Create AppPath location for AmiUpdate use */
BPTR lock = 0, amiupdatefh = 0; BPTR lock = 0;
if(((lock = Lock("ENVARC:AppPaths",SHARED_LOCK)) == 0)) if(((lock = Lock("ENVARC:AppPaths",SHARED_LOCK)) == 0))
{ {
@ -649,6 +649,7 @@ void ami_amiupdate(void)
if(lock = Lock("PROGDIR:", ACCESS_READ)) if(lock = Lock("PROGDIR:", ACCESS_READ))
{ {
char filename[1024]; char filename[1024];
BPTR amiupdatefh;
DevNameFromLock(lock,(STRPTR)&filename,1024L,DN_FULLPATH); DevNameFromLock(lock,(STRPTR)&filename,1024L,DN_FULLPATH);