The merge ate my bracket!
The merge ate my bracket!

Oops, re-add it and get rid of a few now-unused variables

*src/pmdas/papi/papi.c - add bracket and remove a few unused vars

aeg-aeg/pcpfans,prasincs/pcp,mbaldessari/pcp,aeg-aeg/pcpfans,adfernandes/pcp,adfernandes/pcp,edwardt/pcp,wuliming/pcp,wuliming/pcp,tjanez/pcp,wuliming/pcp,wuliming/pcp,andyvand/cygpcpfans,prasincs/pcp,prasincs/pcp,adfernandes/pcp,edwardt/pcp,andyvand/cygpcpfans,mbaldessari/pcp,adfernandes/pcp,aeg-aeg/pcpfans,aeg-aeg/pcpfans,mbaldessari/pcp,tjanez/pcp,tjanez/pcp,aeg-aeg/pcpfans,prasincs/pcp,mbaldessari/pcp,andyvand/cygpcpfans,adfernandes/pcp,mbaldessari/pcp,prasincs/pcp,tjanez/pcp,edwardt/pcp,prasincs/pcp,edwardt/pcp,aeg-aeg/pcpfans,edwardt/pcp,andyvand/cygpcpfans,prasincs/pcp,adfernandes/pcp,tjanez/pcp,edwardt/pcp,edwardt/pcp,wuliming/pcp,tjanez/pcp,wuliming/pcp,andyvand/cygpcpfans,adfernandes/pcp,andyvand/cygpcpfans,mbaldessari/pcp,edwardt/pcp,andyvand/cygpcpfans,prasincs/pcp,adfernandes/pcp,aeg-aeg/pcpfans,tjanez/pcp,tjanez/pcp,wuliming/pcp,aeg-aeg/pcpfans,wuliming/pcp,andyvand/cygpcpfans