Libor Peltan authored Mar 01, 2017 and Daniel Salzman committed Mar 02, 2017

 - error handling: defaults to 0 instead of -1; -1 set on all errors
 - repetitive code: replaced with macros

these improvements are nly slight and better onnes suggested from long perspective