On Wed, Feb 14, 2018 at 10:59 AM, Brandon Williams <bmwill@xxxxxxxxxx> wrote: > Rename C++ keyword in order to bring the codebase closer to being able > to be compiled with a C++ compiler. > > Signed-off-by: Brandon Williams <bmwill@xxxxxxxxxx> > --- > apply.c | 54 +++++++++++++++++++++++++++--------------------------- > 1 file changed, 27 insertions(+), 27 deletions(-) > > diff --git a/apply.c b/apply.c > index 071f653c6..e9f34dceb 100644 > --- a/apply.c > +++ b/apply.c > @@ -2301,7 +2301,7 @@ static void update_pre_post_images(struct image *preimage, > size_t len, size_t postlen) > { > int i, ctx, reduced; > - char *new, *old, *fixed; > + char *new_buf, *old_buf, *fixed; *_buf makes it sound like it could be a strbuf at first, but it is just a buffer. That is ok, as we take over a buffer from 'postimage->buf'. I was suggesting a new name, but given that reuse of "buf", I guess this is fine.