- * Revision 1.91 1999-02-02 14:51:13 adam
+ * Revision 1.93 1999-06-17 14:38:40 adam
+ * Bug fix: Scan SEGV'ed when getting unknown use attribute.
+ *
+ * Revision 1.92 1999/05/26 07:49:13 adam
+ * C++ compilation.
+ *
+ * Revision 1.91 1999/02/02 14:51:13 adam
return zebra_maps_input (p->zm, p->reg_type, from, len);
}
return zebra_maps_input (p->zm, p->reg_type, from, len);
}
- rsfd = xmalloc (sizeof(*rsfd)*rset_no);
- more = xmalloc (sizeof(*more)*rset_no);
- buf = xmalloc (sizeof(*buf)*rset_no);
+ rsfd = (RSFD *) xmalloc (sizeof(*rsfd)*rset_no);
+ more = (int *) xmalloc (sizeof(*more)*rset_no);
+ buf = (struct it_key **) xmalloc (sizeof(*buf)*rset_no);
rsfd[i] = rset_open (rset[i], RSETF_READ);
if (!(more[i] = rset_read (rset[i], rsfd[i], buf[i], &term_index)))
break;
rsfd[i] = rset_open (rset[i], RSETF_READ);
if (!(more[i] = rset_read (rset[i], rsfd[i], buf[i], &term_index)))
break;
grep_info.isam_p_indx, term_dst,
strlen(term_dst), rank_type);
assert (rset[rset_no]);
grep_info.isam_p_indx, term_dst,
strlen(term_dst), rank_type);
assert (rset[rset_no]);
grep_info.isam_p_indx, term_dst,
strlen(term_dst), rank_type);
assert (rset[rset_no]);
grep_info.isam_p_indx, term_dst,
strlen(term_dst), rank_type);
assert (rset[rset_no]);
grep_info.isam_p_indx, term_dst,
strlen(term_dst), rank_type);
assert (rset[rset_no]);
grep_info.isam_p_indx, term_dst,
strlen(term_dst), rank_type);
assert (rset[rset_no]);
grep_info.isam_p_indx, term_dst,
strlen(term_dst), rank_type);
assert (rset[rset_no]);
grep_info.isam_p_indx, term_dst,
strlen(term_dst), rank_type);
assert (rset[rset_no]);
- sort_sequence->specs = nmem_malloc (stream, sort_sequence->num_specs *
- sizeof(*sort_sequence->specs));
+ sort_sequence->specs = (Z_SortKeySpec **)
+ nmem_malloc (stream, sort_sequence->num_specs *
+ sizeof(*sort_sequence->specs));
for (i = 0; i<sort_sequence->num_specs; i++)
sort_sequence->specs[i] = 0;
}
if (zapt->term->which != Z_Term_general)
i = 0;
else
for (i = 0; i<sort_sequence->num_specs; i++)
sort_sequence->specs[i] = 0;
}
if (zapt->term->which != Z_Term_general)
i = 0;
else
- sks = nmem_malloc (stream, sizeof(*sks));
- sks->sortElement = nmem_malloc (stream, sizeof(*sks->sortElement));
+ sks = (Z_SortKeySpec *) nmem_malloc (stream, sizeof(*sks));
+ sks->sortElement = (Z_SortElement *)
+ nmem_malloc (stream, sizeof(*sks->sortElement));
nmem_malloc (stream, sizeof(*sk->u.sortAttributes->list));
sk->u.sortAttributes->list->num_attributes = 1;
nmem_malloc (stream, sizeof(*sk->u.sortAttributes->list));
sk->u.sortAttributes->list->num_attributes = 1;
if (sort_relation_value == 1)
*sks->sortRelation = Z_SortRelation_ascending;
else if (sort_relation_value == 2)
if (sort_relation_value == 1)
*sks->sortRelation = Z_SortRelation_ascending;
else if (sort_relation_value == 2)
- sort_sequence->specs = nmem_malloc (nmem, sort_sequence->num_specs *
- sizeof(*sort_sequence->specs));
+ sort_sequence->specs = (Z_SortKeySpec **)
+ nmem_malloc (nmem, sort_sequence->num_specs *
+ sizeof(*sort_sequence->specs));
static int scan_handle (char *name, const char *info, int pos, void *client)
{
int len_prefix, idx;
static int scan_handle (char *name, const char *info, int pos, void *client)
{
int len_prefix, idx;
len_prefix = strlen(scan_info->prefix);
if (memcmp (name, scan_info->prefix, len_prefix))
len_prefix = strlen(scan_info->prefix);
if (memcmp (name, scan_info->prefix, len_prefix))
- scan_info->list[idx].term = odr_malloc (scan_info->odr,
- strlen(name + len_prefix)+1);
+ scan_info->list[idx].term = (char *)
+ odr_malloc (scan_info->odr, strlen(name + len_prefix)+1);
strcpy (scan_info->list[idx].term, name + len_prefix);
assert (*info == sizeof(ISAM_P));
memcpy (&scan_info->list[idx].isam_p, info+1, sizeof(ISAM_P));
strcpy (scan_info->list[idx].term, name + len_prefix);
assert (*info == sizeof(ISAM_P));
memcpy (&scan_info->list[idx].isam_p, info+1, sizeof(ISAM_P));
term_untrans (zh, reg_type, term_dst, src);
term_untrans (zh, reg_type, term_dst, src);
- scan_info->list = odr_malloc (stream, (before+after)*
- sizeof(*scan_info->list));
+ scan_info->list = (struct scan_info_entry *)
+ odr_malloc (stream, (before+after) * sizeof(*scan_info->list));
dict_scan (zh->dict, termz, &before_tmp, &after_tmp, scan_info,
scan_handle);
}
dict_scan (zh->dict, termz, &before_tmp, &after_tmp, scan_info,
scan_handle);
}