fix a couple of more lazy "return -1"

fix a couple of more lazy "return -1"

Fix should strictly follow the rule to return negative errno-style
error codes from functions, hence let's fix more "return -1"-style
lazinesses.