X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fmatchstr.c;h=b3faae7e4302f52f0047e47b5ff862cee83a9dcd;hp=4db3360138eba5887c2d814e617393c0eda8c6ee;hb=95d8bd04e10519a635972a24176270ef4dbe8d2c;hpb=905df6869e5ad8ab9f34590cce771fe50c444473 diff --git a/src/matchstr.c b/src/matchstr.c index 4db3360..b3faae7 100644 --- a/src/matchstr.c +++ b/src/matchstr.c @@ -1,8 +1,8 @@ /* - * Copyright (c) 1995-2004, Index Data. + * Copyright (C) 1995-2005, Index Data ApS * See the file LICENSE for details. * - * $Id: matchstr.c,v 1.3 2004-12-30 00:14:00 adam Exp $ + * $Id: matchstr.c,v 1.5 2005-06-25 15:46:04 adam Exp $ */ /** @@ -30,28 +30,28 @@ int yaz_matchstr(const char *s1, const char *s2) { while (*s1 && *s2) { - unsigned char c1 = *s1; - unsigned char c2 = *s2; + unsigned char c1 = *s1; + unsigned char c2 = *s2; if (c2 == '?') return 0; - if (c1 == '-') - c1 = *++s1; - if (c2 == '-') - c2 = *++s2; - if (!c1 || !c2) - break; + if (c1 == '-') + c1 = *++s1; + if (c2 == '-') + c2 = *++s2; + if (!c1 || !c2) + break; if (c2 != '.') { - if (isupper(c1)) - c1 = tolower(c1); - if (isupper(c2)) - c2 = tolower(c2); - if (c1 != c2) - break; + if (isupper(c1)) + c1 = tolower(c1); + if (isupper(c2)) + c2 = tolower(c2); + if (c1 != c2) + break; } - s1++; - s2++; + s1++; + s2++; } return *s1 || *s2; } @@ -81,3 +81,11 @@ void __assert_fail (const char *assertion, const char *file, } #endif #endif +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +