[pulseaudio-discuss] [PATCH v2 04/12] daemon: No need to check optarg, -p requires argument

Tanu Kaskinen tanuk at iki.fi
Tue Sep 15 23:41:11 PDT 2015


On Wed, 2015-09-16 at 00:01 +0200, Peter Meerwald wrote:
> From: Peter Meerwald <p.meerwald at bct-electronic.com>
> 
> CID 1323589
> 
> getopt() makes sure that we have an argument for -p
> remove the broken check for optarg being set
> ---
>  src/daemon/cmdline.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/daemon/cmdline.c b/src/daemon/cmdline.c
> index a2fb6d5..68a02e3 100644
> --- a/src/daemon/cmdline.c
> +++ b/src/daemon/cmdline.c
> @@ -312,7 +312,7 @@ int pa_cmdline_parse(pa_daemon_conf *conf, int
> argc, char *const argv [], int *d
>              case 'p':
>              case ARG_DL_SEARCH_PATH:
>                  pa_xfree(conf->dl_search_path);
> -                conf->dl_search_path = *optarg ? pa_xstrdup(optarg)
> : NULL;
> +                conf->dl_search_path = pa_xstrdup(optarg);

What was wrong with the check? Note that *optarg checks whether the
argument is an empty string, not whether optarg is NULL. This changes
the behaviour, and the commit message doesn't really explain what was
wrong with the old behaviour.

-- 
Tanu


More information about the pulseaudio-discuss mailing list