| 18 |
|
}; |
| 19 |
|
|
| 20 |
|
const char MOname[12][10] = { |
| 21 |
< |
"January", "February", "March", "April", "June", "July", |
| 21 |
> |
"January", "February", "March", "April", "May", "June", "July", |
| 22 |
|
"August", "September", "October", "November", "December" |
| 23 |
|
}; |
| 24 |
|
|
| 210 |
|
goto badformat; |
| 211 |
|
if (hdr->isWEA) { /* getting WEA header */ |
| 212 |
|
cp = linbuf+6; |
| 213 |
< |
if (sscanf(cp, "%[^_]_%[^\r\n]q", |
| 214 |
< |
hdr->loc.city, hdr->loc.country) != 2) |
| 213 |
> |
if (sscanf(cp, "%[^_]_%[^\r\n]", |
| 214 |
> |
hdr->loc.city, hdr->loc.country) < 1) |
| 215 |
|
goto badformat; |
| 216 |
|
if (!fgets(linbuf, sizeof(linbuf), hdr->fp)) |
| 217 |
|
goto readerr; |
| 585 |
|
rp->nosnowdays = atoi(cp); |
| 586 |
|
cp = strchr(cp, ','); |
| 587 |
|
} |
| 588 |
< |
if (!cp++) goto badformat; |
| 588 |
> |
if (!cp++) goto skiprest; |
| 589 |
|
if (*cp != ',') { |
| 590 |
|
rp->albedo = atof(cp); |
| 591 |
|
cp = strchr(cp, ','); |
| 592 |
|
} |
| 593 |
< |
if (!cp++) goto badformat; |
| 593 |
> |
if (!cp++) goto skiprest; |
| 594 |
|
if (*cp != ',') { |
| 595 |
|
rp->liqpdepth = atof(cp) * 1e-3; |
| 596 |
|
cp = strchr(cp, ','); |
| 597 |
|
} |
| 598 |
< |
if (!cp++) goto badformat; |
| 598 |
> |
if (!cp++) goto skiprest; |
| 599 |
|
if ((*cp != ',') & (*cp != '\n')) |
| 600 |
|
rp->liqhours = atof(cp); |
| 601 |
+ |
skiprest: |
| 602 |
|
if (scan_date(epw) || feof(epw->fp)) |
| 603 |
|
return(1); /* normal return (even if next is EOF) */ |
| 604 |
|
badformat: |
