tree b7862fa33c32a8883de828f6a6066609890969d1
parent 4cde773435074809672f9de6a47b26de902a83d1
author Dave Allison <dallison@google.com> 1394812473 -0700
committer Dave Allison <dallison@google.com> 1394831708 +0000

Move options buffers to top scope

It is important that the char buffers for options do
not go out of scope as the mOptions.add() does not copy
the buffer.  This moves all the buffers to the top
level scope of the function to prevent accidental
overwriting when they go out of scope.

Bug: 13448497
Change-Id: I5a97ddd32ff34f237915927906e1e1f833ff036e