swconfig: remove useless variables, return -1 on errors