fix some static code analysis complaints.
see http://www.viva64.com/en/k/0023/

Conflicts:
	textstore.c
Merge branch 'master' of github.com:badgerman/storage

Conflicts:
	textstore.c