projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug #2352: yaz-marcdump crashes for certain record.
[yaz-moved-to-github.git]
/
src
/
matchstr.c
diff --git
a/src/matchstr.c
b/src/matchstr.c
index
efbc7ef
..
4c3bcf2
100644
(file)
--- a/
src/matchstr.c
+++ b/
src/matchstr.c
@@
-1,13
+1,11
@@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: matchstr.c,v 1.4 2005-01-15 19:47:14 adam Exp $
*/
/**
* \file matchstr.c
*/
/**
* \file matchstr.c
- * \brief Implements loose string matching
+ * \brief a couple of string utilities
*/
#if HAVE_CONFIG_H
*/
#if HAVE_CONFIG_H
@@
-18,40
+16,34
@@
#include <assert.h>
#include <ctype.h>
#include <string.h>
#include <assert.h>
#include <ctype.h>
#include <string.h>
-#include <yaz/yaz-util.h>
-
-/*
- * Match strings, independently of case and occurences of '-'.
- * fairly inefficient - will be replaced with an indexing scheme for
- * the various subsystems if we get a bottleneck here.
- */
+#include <yaz/matchstr.h>
int yaz_matchstr(const char *s1, const char *s2)
{
while (*s1 && *s2)
{
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 (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 (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;
}
}
return *s1 || *s2;
}
@@
-70,14
+62,20
@@
int yaz_strcmp_del(const char *a, const char *b, const char *b_del)
return *a - *b;
}
return *a - *b;
}
-#ifdef __GNUC__
-#ifdef __CHECKER__
-void __assert_fail (const char *assertion, const char *file,
- unsigned int line, const char *function)
+int yaz_memcmp(const void *a, const void *b, size_t len_a, size_t len_b)
{
{
- fprintf (stderr, "%s in file %s line %d func %s\n",
- assertion, file, line, function);
- abort ();
+ size_t m_len = len_a < len_b ? len_a : len_b;
+ int r = memcmp(a, b, m_len);
+ if (r)
+ return r;
+ return len_a - len_b;
}
}
-#endif
-#endif
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+