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
Changed type of a few variables to avoid warnings.
[yaz-moved-to-github.git]
/
util
/
pquery.c
diff --git
a/util/pquery.c
b/util/pquery.c
index
80d1031
..
ad22d34
100644
(file)
--- a/
util/pquery.c
+++ b/
util/pquery.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: pquery.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: pquery.c,v $
- * Revision 1.13 1997-09-17 12:10:42 adam
+ * Revision 1.15 1997-09-29 07:13:43 adam
+ * Changed type of a few variables to avoid warnings.
+ *
+ * Revision 1.14 1997/09/22 12:33:41 adam
+ * Fixed bug introduced by previous commit.
+ *
+ * Revision 1.13 1997/09/17 12:10:42 adam
* YAZ version 1.4.
*
* Revision 1.12 1997/09/01 08:54:13 adam
* YAZ version 1.4.
*
* Revision 1.12 1997/09/01 08:54:13 adam
@@
-62,7
+68,7
@@
static oid_value p_query_dfset = VAL_NONE;
struct lex_info {
const char *query_buf;
const char *lex_buf;
struct lex_info {
const char *query_buf;
const char *lex_buf;
- int lex_len;
+ size_t lex_len;
int query_look;
char *left_sep;
char *right_sep;
int query_look;
char *left_sep;
char *right_sep;
@@
-85,11
+91,11
@@
static int query_oid_getvalbyname (struct lex_info *li)
return oid_getvalbyname (buf);
}
return oid_getvalbyname (buf);
}
-static int compare_term (struct lex_info *li, const char *src, int off)
+static int compare_term (struct lex_info *li, const char *src, size_t off)
{
size_t len=strlen(src);
{
size_t len=strlen(src);
- if (li->lex_len == len && !memcmp (li->lex_buf+off, src, len-off))
+ if (li->lex_len == len+off && !memcmp (li->lex_buf+off, src, len-off))
return 1;
return 0;
}
return 1;
return 0;
}
@@
-379,7
+385,7
@@
static Z_RPNStructure *rpn_structure (struct lex_info *li, ODR o,
if (num_attr >= max_attr)
return NULL;
if (!(cp = strchr (li->lex_buf, '=')) ||
if (num_attr >= max_attr)
return NULL;
if (!(cp = strchr (li->lex_buf, '=')) ||
- (cp-li->lex_buf) > li->lex_len)
+ (size_t) (cp-li->lex_buf) > li->lex_len)
{
attr_set[num_attr] = query_oid_getvalbyname (li);
lex (li);
{
attr_set[num_attr] = query_oid_getvalbyname (li);
lex (li);
@@
-516,7
+522,7
@@
Z_AttributesPlusTerm *p_query_scan_mk (struct lex_info *li,
return NULL;
if (!(cp = strchr (li->lex_buf, '=')) ||
return NULL;
if (!(cp = strchr (li->lex_buf, '=')) ||
- (cp-li->lex_buf) > li->lex_len)
+ (size_t) (cp-li->lex_buf) > li->lex_len)
{
attr_set[num_attr] = query_oid_getvalbyname (li);
lex (li);
{
attr_set[num_attr] = query_oid_getvalbyname (li);
lex (li);