fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify str_toupper() in "utils.c".

Browse Source 
Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer
2011-03-04 08:51:36 +01:00
parent 05900b62e9
commit 061f74108b
3 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/io.c
View File

@@ -1916,32 +1916,31 @@ ical_chk_header (FILE *fd, unsigned *lineno)
(void)fgets (buf, BUFSIZ, fd);
(*lineno)++;
if (buf == NULL
|| strncmp (str_toupper (buf), icalheader.str, icalheader.len) != 0)
{
return HEADER_MALFORMED;
}
else
{
const int AWAITED = 1;
float version = HEADER_MALFORMED;
int read;
do
if (buf == NULL) return HEADER_MALFORMED;
str_toupper (buf);
if (strncmp (buf, icalheader.str, icalheader.len) != 0)
return HEADER_MALFORMED;
const int AWAITED = 1;
float version = HEADER_MALFORMED;
int read;
do
{
if (fgets (buf, BUFSIZ, fd) == NULL)
{
if (fgets (buf, BUFSIZ, fd) == NULL)
{
return HEADER_MALFORMED;
}
else
{
(*lineno)++;
read = sscanf (buf, "VERSION:%f", &version);
}
return HEADER_MALFORMED;
}
else
{
(*lineno)++;
read = sscanf (buf, "VERSION:%f", &version);
}
while (read != AWAITED);
return version;
}
while (read != AWAITED);
return version;
}
/*