Code improvement: - don't use fgetc if you can get away with getc (less function call   overhead); - by doing error checking in the correct order, we don't need goto. - simplified Boolean operations (I think).
Code improvement:
- don't use fgetc if you can get away with getc (less function call
  overhead);
- by doing error checking in the correct order, we don't need goto.
- simplified Boolean operations (I think).

zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb