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
Added braces to avoid warning.
[yaz-moved-to-github.git]
/
ccl
/
cclqual.c
diff --git
a/ccl/cclqual.c
b/ccl/cclqual.c
index
55cf773
..
343d64f
100644
(file)
--- a/
ccl/cclqual.c
+++ b/
ccl/cclqual.c
@@
-45,7
+45,13
@@
* Europagate, 1995
*
* $Log: cclqual.c,v $
* Europagate, 1995
*
* $Log: cclqual.c,v $
- * Revision 1.8 1997-09-29 08:56:38 adam
+ * Revision 1.10 1998-07-07 15:49:40 adam
+ * Added braces to avoid warning.
+ *
+ * Revision 1.9 1998/02/11 11:53:33 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.8 1997/09/29 08:56:38 adam
* Changed CCL parser to be thread safe. New type, CCL_parser, declared
* and a create/destructers ccl_parser_create/ccl_parser/destory has
* been added.
* Changed CCL parser to be thread safe. New type, CCL_parser, declared
* and a create/destructers ccl_parser_create/ccl_parser/destory has
* been added.
@@
-122,13
+128,13
@@
void ccl_qual_add (CCL_bibset b, const char *name, int no, int *pairs)
break;
if (!q)
{
break;
if (!q)
{
- struct ccl_qualifier *new_qual = malloc (sizeof(*new_qual));
+ struct ccl_qualifier *new_qual = (struct ccl_qualifier *)malloc (sizeof(*new_qual));
assert (new_qual);
new_qual->next = b->list;
b->list = new_qual;
assert (new_qual);
new_qual->next = b->list;
b->list = new_qual;
- new_qual->name = malloc (strlen(name)+1);
+ new_qual->name = (char *)malloc (strlen(name)+1);
assert (new_qual->name);
strcpy (new_qual->name, name);
attrp = &new_qual->attr_list;
assert (new_qual->name);
strcpy (new_qual->name, name);
attrp = &new_qual->attr_list;
@@
-143,7
+149,7
@@
void ccl_qual_add (CCL_bibset b, const char *name, int no, int *pairs)
{
struct ccl_rpn_attr *attr;
{
struct ccl_rpn_attr *attr;
- attr = malloc (sizeof(*attr));
+ attr = (struct ccl_rpn_attr *)malloc (sizeof(*attr));
assert (attr);
attr->type = *pairs++;
attr->value = *pairs++;
assert (attr);
attr->type = *pairs++;
attr->value = *pairs++;
@@
-159,7
+165,7
@@
void ccl_qual_add (CCL_bibset b, const char *name, int no, int *pairs)
*/
CCL_bibset ccl_qual_mk (void)
{
*/
CCL_bibset ccl_qual_mk (void)
{
- CCL_bibset b = malloc (sizeof(*b));
+ CCL_bibset b = (CCL_bibset)malloc (sizeof(*b));
assert (b);
b->list = NULL;
return b;
assert (b);
b->list = NULL;
return b;
@@
-208,6
+214,7
@@
struct ccl_rpn_attr *ccl_qual_search (CCL_parser cclp,
return NULL;
for (q = cclp->bibset->list; q; q = q->next)
if (strlen(q->name) == len)
return NULL;
for (q = cclp->bibset->list; q; q = q->next)
if (strlen(q->name) == len)
+ {
if (cclp->ccl_case_sensitive)
{
if (!memcmp (name, q->name, len))
if (cclp->ccl_case_sensitive)
{
if (!memcmp (name, q->name, len))
@@
-218,6
+225,7
@@
struct ccl_rpn_attr *ccl_qual_search (CCL_parser cclp,
if (!ccl_memicmp (name, q->name, len))
return q->attr_list;
}
if (!ccl_memicmp (name, q->name, len))
return q->attr_list;
}
+ }
return NULL;
}
return NULL;
}