Fix compilation warnings and code clean up

- Remove old commented code
- Change name of folder_file struct so they do not shadow
  each others. It'd probably be better to use only one struct
  but the code is too big to look at that possibility.

Signed-off-by: Julien Danjou <julien@danjou.info>
Signed-off-by: Pierre Habouzit <madcoder@debian.org>