comparison subreader.c @ 31871:c3775dbb8509

Simplify code: allow file_format argument to open_stream to be NULL.

31870:e061d5d981ba

	    { sub_read_line_mpl2, NULL, "mpl2" }
    };
    const struct subreader *srp;

    if(filename==NULL) return NULL; //qnx segfault
    i = 0;
    fd=open_stream (filename, NULL, &i); if (!fd) return NULL;

    sub_format = SUB_INVALID;
    for (utf16 = 0; sub_format == SUB_INVALID && utf16 < 3; utf16++) {
        sub_format=sub_autodetect (fd, &uses_time, utf16);
        stream_reset(fd);

31871:c3775dbb8509

	    { sub_read_line_mpl2, NULL, "mpl2" }
    };
    const struct subreader *srp;

    if(filename==NULL) return NULL; //qnx segfault
    fd=open_stream (filename, NULL, NULL); if (!fd) return NULL;

    sub_format = SUB_INVALID;
    for (utf16 = 0; sub_format == SUB_INVALID && utf16 < 3; utf16++) {
        sub_format=sub_autodetect (fd, &uses_time, utf16);
        stream_reset(fd);