[deadbeef/f36] (3 commits) ...Fix -Wunused-variable berror.