*** empty log message ***

[yaz-moved-to-github.git] / util / yaz-util.c

diff --git a/util/yaz-util.c b/util/yaz-util.c
index 8fda91a..40f22c8 100644 (file)
--- a/util/yaz-util.c
+++ b/util/yaz-util.c
@@ -1,10 +1,20 @@
 /*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-1997, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: yaz-util.c,v $
- * Revision 1.4  1997-05-01 15:07:55  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
  * Added DLL entry point routines.
  *
  * Revision 1.3  1996/10/29 13:36:28  adam
@@ -21,9 +31,11 @@
  *
  *
  */
-
+#include <stdio.h>
+#include <assert.h>
 #include <ctype.h>
 #include <yaz-util.h>
+
 /*
  * Match strings, independently of case and occurences of '-'.
  * fairly inefficient - will be replaced with an indexing scheme for
@@ -36,6 +48,8 @@ int yaz_matchstr(const char *s1, const char *s2)
     {
        char c1, c2;
 
+        if (*s2 == '?')
+            return 0;
        if (*s1 == '-')
            s1++;
        if (*s2 == '-')
@@ -56,24 +70,14 @@ int yaz_matchstr(const char *s1, const char *s2)
     return *s1 || *s2;
 }
 
-
-#ifdef WINDOWS
- 
-#include <windows.h>
-BOOL APIENTRY DllMain(hInst, reason, reserved)
-    HINSTANCE hInst; /* Library instance handle. */
-    DWORD reason;    /* Reason this function is being called. */
-    LPVOID reserved; /* Not used. */
+#ifdef __GNUC__
+#ifdef __CHECKER__
+void __assert_fail (const char *assertion, const char *file, 
+                    unsigned int line, const char *function)
 {
-    return TRUE;
+    fprintf (stderr, "%s in file %s line %d func %s\n",
+             assertion, file, line, function);
+    abort ();
 }
- 
-BOOL APIENTRY DllEntryPoint(hInst, reason, reserved)
-    HINSTANCE hInst; /* Library instance handle. */
-    DWORD reason;    /* Reason this function is being called. */
-    LPVOID reserved; /* Not used. */
-{
-    return TRUE;
-}                                                                              
 #endif
-
+#endif