[FFmpeg-devel] [PATCH] ffserver: factorize code setting ReadOnlyFile/File options

[Stefano Sabatini]

On date Thursday 2013-11-28 22:17:25 +0100, Clément Bœsch encoded:
> On Thu, Nov 28, 2013 at 09:07:20PM +0100, Stefano Sabatini wrote:
> > ---
> >  ffserver.c | 9 ++-------
> >  1 file changed, 2 insertions(+), 7 deletions(-)
> > 
> > diff --git a/ffserver.c b/ffserver.c
> > index 342c5fa..a927a07 100644
> > --- a/ffserver.c
> > +++ b/ffserver.c
> > @@ -4209,18 +4209,13 @@ static int parse_ffconfig(const char *filename)
> >                      goto end;
> >                  }
> >              }
> > -        } else if (!av_strcasecmp(cmd, "ReadOnlyFile")) {
> > +        } else if (!av_strcasecmp(cmd, "File") || !av_strcasecmp(cmd, "ReadOnlyFile")) {
> >              if (feed) {
> >                  get_arg(feed->feed_filename, sizeof(feed->feed_filename), &p);
> > -                feed->readonly = 1;
> > +                feed->readonly = !av_strcasecmp(cmd, "ReadOnlyFile");
> 
> nit++: !av_strncasecmp(cmd, "ReadOnly", 8)

I consider my version slightly more robust (no need to check string
size).

> 
> >              } else if (stream) {
> >                  get_arg(stream->feed_filename, sizeof(stream->feed_filename), &p);
> >              }
> > -        } else if (!av_strcasecmp(cmd, "File")) {
> > -            if (feed) {
> > -                get_arg(feed->feed_filename, sizeof(feed->feed_filename), &p);
> > -            } else if (stream)
> > -                get_arg(stream->feed_filename, sizeof(stream->feed_filename), &p);
> >          } else if (!av_strcasecmp(cmd, "Truncate")) {
> >              if (feed) {
> >                  get_arg(arg, sizeof(arg), &p);
> 
> LGTM

Applied, thanks.
-- 
FFmpeg = Fundamentalist and Fierce Mean Portable Excellent Genius