Re: [PATCH 3/6] bootstrap: Add gnulib's base64 module

[Patrick Steinhardt]

On Mon, Nov 04, 2019 at 10:30:01AM +0000, Max Tottenham wrote:
> On 11/02, Patrick Steinhardt wrote:
[snip]
> > --- /dev/null
> > +++ b/grub-core/lib/gnulib-patches/fix-base64.patch
> > @@ -0,0 +1,26 @@
> > +diff --git a/lib/base64.h b/lib/base64.h
> > +index 9cd0183b8..7b06e03df 100644
> > +--- a/lib/base64.h
> > ++++ b/lib/base64.h
> > +@@ -21,8 +21,10 @@
> > + /* Get size_t. */
> > + # include <stddef.h>
> > + 
> > +-/* Get bool. */
> > +-# include <stdbool.h>
> > ++#ifndef GRUB_POSIX_BOOL_DEFINED
> > ++typedef enum { false = 0, true = 1 } bool;
> > ++#define GRUB_POSIX_BOOL_DEFINED 1
> > ++#endif
> > + 
> > + # ifdef __cplusplus
> > + extern "C" {
> > +@@ -38,7 +40,7 @@ struct base64_decode_context
> > +   char buf[4];
> > + };
> > + 
> > +-extern bool isbase64 (char ch) _GL_ATTRIBUTE_CONST;
> > ++extern bool isbase64 (char ch);
> 
> Is there a reason the const attribute has been removed from this
> function in this patch? If so then I think you should add a rationale
> for that in your commit message.

Fair. I remember that the attribute wasn't defined when it's been
included by others, probably due to a missing include. I'll make
sure to add some more details to the commit message.

Patrick

signature.asc
Description: PGP signature