X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2Fyaz-util.c;h=40f22c85620a00085eb10f2fa0672336150e3fa9;hp=a6eea5b7da76f6ef6dbd3ff5f8b05e7af8cf4d15;hb=8de81d57ebf189d37a160fe66df667b50ba7cb86;hpb=605bd5bc3803abd10df0efb91ab385828f40a57d diff --git a/util/yaz-util.c b/util/yaz-util.c index a6eea5b..40f22c8 100644 --- a/util/yaz-util.c +++ b/util/yaz-util.c @@ -4,7 +4,14 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: yaz-util.c,v $ - * Revision 1.5 1997-07-21 12:48:11 adam + * Revision 1.7 1997-09-30 11:47:47 adam + * Added function 'cause checkergcc doesn't include assert handler. + * + * Revision 1.6 1997/09/04 07:54:34 adam + * Right hande side operand of yaz_matchstr may include a ? in + * which case it returns "match ok". + * + * Revision 1.5 1997/07/21 12:48:11 adam * Removed windows DLL stubs. * * Revision 1.4 1997/05/01 15:07:55 adam @@ -24,9 +31,11 @@ * * */ - +#include +#include #include #include + /* * Match strings, independently of case and occurences of '-'. * fairly inefficient - will be replaced with an indexing scheme for @@ -39,6 +48,8 @@ int yaz_matchstr(const char *s1, const char *s2) { char c1, c2; + if (*s2 == '?') + return 0; if (*s1 == '-') s1++; if (*s2 == '-') @@ -58,3 +69,15 @@ int yaz_matchstr(const char *s1, const char *s2) } return *s1 || *s2; } + +#ifdef __GNUC__ +#ifdef __CHECKER__ +void __assert_fail (const char *assertion, const char *file, + unsigned int line, const char *function) +{ + fprintf (stderr, "%s in file %s line %d func %s\n", + assertion, file, line, function); + abort (); +} +#endif +#endif