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