[FFmpeg-devel] [PATCH] lavu/hash.c: Add missing "static const".

[Clément Bœsch]

On Sun, Aug 31, 2014 at 10:46:29AM +0200, Reimar Döffinger wrote:
> On Sat, Aug 30, 2014 at 11:23:52PM +0200, Reimar Döffinger wrote:
> > On 30.08.2014, at 21:50, Clément Bœsch <u at pkh.me> wrote:
> > > On Sat, Aug 30, 2014 at 04:36:57PM +0200, Reimar Döffinger wrote:
> > >> On Fri, Aug 29, 2014 at 09:29:46PM +0200, Clément Bœsch wrote:
> > >>> On Fri, Aug 29, 2014 at 06:34:52PM +0200, Reimar Döffinger wrote:
> > >>>> Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
> > >>>> ---
> > >>>> libavutil/hash.c | 2 +-
> > >>>> 1 file changed, 1 insertion(+), 1 deletion(-)
> > >>>> 
> > >>>> diff --git a/libavutil/hash.c b/libavutil/hash.c
> > >>>> index 773f29e..979fdd9 100644
> > >>>> --- a/libavutil/hash.c
> > >>>> +++ b/libavutil/hash.c
> > >>>> @@ -63,7 +63,7 @@ typedef struct AVHashContext {
> > >>>> struct {
> > >>>>     const char *name;
> > >>>>     int size;
> > >>>> -} hashdesc[] = {
> > >>>> +} static const hashdesc[] = {
> > >>>>     [MD5]     = {"MD5",     16},
> > >>>>     [MURMUR3] = {"murmur3", 16},
> > >>>>     [RIPEMD128] = {"RIPEMD128", 16},
> > >>> 
> > >>> shouldn't that be static const struct { } hashdesc[] = { ... }
> > >>> 
> > >>> as in static const <type> foo[] = { ... };
> > >> 
> > >> Reason I prefer this one is that if the struct becomes
> > >> large it because very non-obvious that the array actually is
> > >> "static const".
> > >> It also is much harder to check/filter with grep.
> > >> So for practical reasons I think it is better to place it here,
> > >> or alternatively to name the struct and split them...
> > >> But mostly I care about having it in .rodata, everything else
> > >> I'm willing to adapt to what others prefer.
> > > 
> > > I'm mostly concerned about consistency. Except the one you added in
> > > drawtext, this form is never used:
> > 
> > Hm, ok. I'll change it then.
> 
> Pushed with that change, made drawtext match with the rest.

Thanks

As a side note, this fixes the following warning:
  warning: ‘static’ is not at beginning of declaration [-Wold-style-declaration]

(but it's not enabled by default in FFmpeg tree, it's part of -Wextra)

-- 
Clément B.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 473 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20140831/9afc4e94/attachment.asc>