vncpcap2john fixes (mixed declarations and code).
Merge branch 'bleeding-jumbo' into memdbg

* bleeding-jumbo:
  vncpcap2john fixes (mixed declarations and code).