Attachment #669773 for bug #752015

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





    a = python_to_icu(a_, &asz);
    if (a == NULL) goto end;
    if (asz == 0) { found = 1; goto end; }
    b = python_to_icu(b_, &bsz);
    if (b == NULL) goto end;

    search = usearch_openFromCollator(a, asz, b, bsz, self->collator, NULL, &status);
    if (U_SUCCESS(status)) {
        pos = usearch_first(search, &status);
        if (pos != USEARCH_DONE) found = 1;
    }
end:
    if (search != NULL) usearch_close(search);

Lines 15-21 Link Here

(-)a/src/calibre/utils/matcher.c (-2 lines)
15	#define inline	15	#define inline
16	#endif	16	#endif
17		17
18	typedef unsigned char bool;
19	#define TRUE 1	18	#define TRUE 1
20	#define FALSE 0	19	#define FALSE 0
21	#define MAX(x, y) ((x > y) ? x : y)	20	#define MAX(x, y) ((x > y) ? x : y)
22	-

Return to bug 752015

Lines 238-251 icu_Collator_contains(icu_Collator self, PyObject args) { Link Here

(-)a/src/calibre/utils/icu.c (-2 / +2 lines)
238		238
239	a = python_to_icu(a_, &asz);	239	a = python_to_icu(a_, &asz);
240	if (a == NULL) goto end;	240	if (a == NULL) goto end;
241	if (asz == 0) { found = TRUE; goto end; }	241	if (asz == 0) { found = 1; goto end; }
242	b = python_to_icu(b_, &bsz);	242	b = python_to_icu(b_, &bsz);
243	if (b == NULL) goto end;	243	if (b == NULL) goto end;
244		244
245	search = usearch_openFromCollator(a, asz, b, bsz, self->collator, NULL, &status);	245	search = usearch_openFromCollator(a, asz, b, bsz, self->collator, NULL, &status);
246	if (U_SUCCESS(status)) {	246	if (U_SUCCESS(status)) {
247	pos = usearch_first(search, &status);	247	pos = usearch_first(search, &status);
248	if (pos != USEARCH_DONE) found = TRUE;	248	if (pos != USEARCH_DONE) found = 1;
249	}	249	}
250	end:	250	end:
251	if (search != NULL) usearch_close(search);	251	if (search != NULL) usearch_close(search);