[vlc-devel] [vlc-commits] cdda: factor common open code

[Hugo Beauzée-Luyssen]

Hi,

On 12/30/2016 12:17 PM, Rémi Denis-Courmont wrote:
> vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Dec 30 12:31:10 2016 +0200| [5be75ee79d742324d95df259c2e683e178fe92fb] | committer: Rémi Denis-Courmont
>
> cdda: factor common open code
>
>> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5be75ee79d742324d95df259c2e683e178fe92fb
> ---
>
>  modules/access/cdda.c | 92 ++++++++++++++++++++++-----------------------------
>  1 file changed, 39 insertions(+), 53 deletions(-)
>
> diff --git a/modules/access/cdda.c b/modules/access/cdda.c
> index 576f400..a95b75b 100644
> --- a/modules/access/cdda.c
> +++ b/modules/access/cdda.c
> @@ -56,6 +56,32 @@
>   #include <errno.h>
>  #endif
>
> +static vcddev_t *DiscOpen(vlc_object_t *obj, const char *path)
> +{
> +    char *filename;
> +
> +    if (path == NULL)
> +        filename = var_InheritString(obj, "cd-audio");
> +    else
> +        filename = ToLocaleDup(path);
> +    if (filename == NULL)
> +        return NULL;
> +
> +#if defined (_WIN32) || defined (__OS2__)
> +    /* Trim backslash after drive letter */
> +    if (filename[0] != '\0' && !strcmp(&filename[1], ":\\")

This doesn't compile.

Regards,