/*
- * Copyright (C) 1994, Index Data I/S
+ * Copyright (C) 1994-1996, Index Data I/S
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: insert.c,v $
- * Revision 1.12 1995-09-06 10:34:44 adam
+ * Revision 1.17 1996-05-14 15:49:09 adam
+ * Bug fix: In function split_page. In rare cases variable best_indxp was
+ * referenced.
+ *
+ * Revision 1.16 1996/02/02 13:43:50 adam
+ * The public functions simply use char instead of Dict_char to represent
+ * search strings. Dict_char is used internally only.
+ *
+ * Revision 1.15 1996/02/01 20:39:59 adam
+ * Bug fix: insert didn't work on 8-bit characters due to unsigned char
+ * compares in dict_strcmp (strcmp) and signed Dict_char. Dict_char is
+ * unsigned now.
+ *
+ * Revision 1.14 1995/12/07 11:48:56 adam
+ * Insert operation obeys DICT_type = 1 (slack in page).
+ * Function dict_open exists if page size or magic aren't right.
+ *
+ * Revision 1.13 1995/11/28 09:06:37 adam
+ * Fixed potential dangling pointer.
+ *
+ * Revision 1.12 1995/09/06 10:34:44 adam
* Memcpy in clean_page edited to satisfy checkergcc.
*
* Revision 1.11 1995/09/04 12:33:31 adam
void *subp;
char *info_here;
Dict_ptr subptr;
- int i;
+ int i, j;
short *indxp, *best_indxp = NULL;
Dict_char best_char = 0;
Dict_char prev_char = 0;
{ /* first entry met */
best_char = prev_char = dc;
best_no = 1;
+ best_indxp = indxp;
}
else if (prev_char == dc)
{ /* same char prefix. update */
if (best_no < 0) /* we didn't find any tail string entry at all! */
return -1;
+ j = best_indxp - (short*) p;
subptr = new_page (dict, ptr, &subp);
/* scan entries to see if there is a string with */
/* length 1. info_here indicates if such entry exist */
info_here = NULL;
- for (indxp=best_indxp, i=0; i<best_no; i++, indxp++)
+ for (i=0; i<best_no; i++, j++)
{
char *info, *info1;
int slen;
-
- assert (*indxp > 0);
+ Dict_char dc;
- info = (char*) p + *indxp; /* entry start */
- assert (*info == best_char);
- slen = dict_strlen(info);
+
+ info = (char*) p + ((short*) p)[j];
+ /* entry start */
+ memcpy (&dc, info, sizeof(dc));
+ assert (dc == best_char);
+ slen = dict_strlen((Dict_char*) info);
assert (slen > 0);
if (slen == 1)
else
{
info1 = info+(1+slen)*sizeof(Dict_char); /* info start */
- dict_ins (dict, info+sizeof(Dict_char), subptr, *info1, info1+1);
+ dict_ins (dict, (Dict_char*) (info+sizeof(Dict_char)),
+ subptr, *info1, info1+1);
dict_bf_readp (dict->dbf, ptr, &p);
}
}
continue;
}
*--indxp2 = info2 - np;
- slen = (dict_strlen(info1)+1)*sizeof(Dict_char);
+ slen = (dict_strlen((Dict_char*) info1)+1)*sizeof(Dict_char);
memcpy (info2, info1, slen);
info1 += slen;
info2 += slen;
cmp = dict_strcmp((Dict_char*) info, str);
if (!cmp)
{
- info += (dict_strlen(info)+1)*sizeof(Dict_char);
+ info += (dict_strlen((Dict_char*) info)+1)*sizeof(Dict_char);
/* consider change of userinfo length... */
if (*info == userlen)
{
if (DICT_size(p)+slen+userlen >=
DICT_pagesize(dict) - (1+DICT_nodir(p))*sizeof(short)) /* overflow? */
{
+ if (DICT_type(p))
+ {
+ clean_page (dict, ptr, p, NULL, 0, NULL);
+ return dict_ins (dict, str, ptr, userlen, userinfo);
+ }
split_page (dict, ptr, p);
return dict_ins (dict, str, ptr, userlen, userinfo);
}
return 1;
}
-int dict_insert (Dict dict, const Dict_char *str, int userlen, void *userinfo)
+int dict_insert (Dict dict, const char *str, int userlen, void *userinfo)
{
assert (dict->head.last > 0);
if (dict->head.last == 1)
- return dict_ins (dict, str, 0, userlen, userinfo);
+ return dict_ins (dict, (const Dict_char *) str, 0, userlen, userinfo);
else
- return dict_ins (dict, str, 1, userlen, userinfo);
+ return dict_ins (dict, (const Dict_char *) str, 1, userlen, userinfo);
}