Since those are chunks of code based on our codebase, it's easiest to use the same license.
Turn this: if ((r = foo()) < 0) { ... into this: r = foo(); if (r < 0) { ...