notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

parse_options can open the file itself

Browse source
This commit is contained in:
Albert Cahalan 2009-11-08 03:17:13 +00:00
parent 93b47299f2
commit cba6b6894d
1 changed files with 8 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/tuxpaint.c
View file

@ -18785,8 +18785,12 @@ void load_info_about_label_surface(char lfname[1024])
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
static void parse_options(FILE * fi) static void parse_options(char *filename)
{ {
FILE *fi = fopen(filename, "r");
if(!fi)
return;
char str[256]; char str[256];
do do
@ -19240,6 +19244,7 @@ static void parse_options(FILE * fi)
} }
} }
while (!feof(fi)); while (!feof(fi));
fclose(fi);
} }
@ -19442,14 +19447,7 @@ static void setup(int argc, char *argv[])
strcpy(str, "tuxpaint.cfg"); strcpy(str, "tuxpaint.cfg");
#endif #endif
fi = fopen(str, "r"); parse_options(str);
if (fi != NULL)
{
parse_options(fi);
fclose(fi);
}
else
debug(str);
} }
@ -19487,15 +19485,7 @@ static void setup(int argc, char *argv[])
} }
#endif #endif
parse_options(str);
fi = fopen(str, "r");
if (fi != NULL)
{
parse_options(fi);
fclose(fi);
}
else
debug(str);
/* Handle command-line arguments: */ /* Handle command-line arguments: */