View | Details | Raw Unified | Return to bug 57585
Collapse All | Expand All

(-)config-old.c (-4 / +10 lines)
Lines 1848-1855 Link Here
1848
         */
1848
         */
1849
        rv = apr_dir_open(&dirp, path, ptemp);
1849
        rv = apr_dir_open(&dirp, path, ptemp);
1850
        if (rv != APR_SUCCESS) {
1850
        if (rv != APR_SUCCESS) {
1851
            return apr_psprintf(p, "Could not open config directory %s: %pm",
1851
            if (!optional)
1852
                                path, &rv);
1852
                return apr_psprintf(p, "Could not open config directory %s: %pm",
1853
                                    path, &rv);
1854
            else
1855
                return NULL;
1853
        }
1856
        }
1854
1857
1855
        candidates = apr_array_make(ptemp, 1, sizeof(fnames));
1858
        candidates = apr_array_make(ptemp, 1, sizeof(fnames));
Lines 1934-1941 Link Here
1934
     */
1937
     */
1935
    rv = apr_dir_open(&dirp, path, ptemp);
1938
    rv = apr_dir_open(&dirp, path, ptemp);
1936
    if (rv != APR_SUCCESS) {
1939
    if (rv != APR_SUCCESS) {
1937
        return apr_psprintf(p, "Could not open config directory %s: %pm",
1940
            if (!optional)
1938
                            path, &rv);
1941
                return apr_psprintf(p, "Could not open config directory %s: %pm",
1942
                                    path, &rv);
1943
            else
1944
                return NULL;
1939
    }
1945
    }
1940
1946
1941
    candidates = apr_array_make(ptemp, 1, sizeof(fnames));
1947
    candidates = apr_array_make(ptemp, 1, sizeof(fnames));

Return to bug 57585