-/* $Id: kinput.c,v 1.63 2004-11-19 10:26:57 heikki Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
- Index Data Aps
+/* $Id: kinput.c,v 1.65 2005-04-13 13:03:47 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
while (hci.more)
{
char this_name[INP_NAME_MAX];
- ISAMC_P isamc_p, isamc_p2;
+ ISAM_P isamc_p, isamc_p2;
char *dict_info;
strcpy (this_name, hci.cur_name);
hi->no_diffs++;
if ((dict_info = dict_lookup (hi->reg->dict, hci.cur_name)))
{
- memcpy (&isamc_p, dict_info+1, sizeof(ISAMC_P));
- isamc_p2 = isc_merge (hi->reg->isamc, isamc_p, isamc_i);
+ memcpy (&isamc_p, dict_info+1, sizeof(ISAM_P));
+ isamc_p2 = isamc_p;
+ isamc_merge (hi->reg->isamc, &isamc_p2, isamc_i);
if (!isamc_p2)
{
hi->no_deletions++;
hi->no_updates++;
if (isamc_p2 != isamc_p)
dict_insert (hi->reg->dict, this_name,
- sizeof(ISAMC_P), &isamc_p2);
+ sizeof(ISAM_P), &isamc_p2);
}
}
else
{
- isamc_p = isc_merge (hi->reg->isamc, 0, isamc_i);
+ isamc_p = 0;
+ isamc_merge (hi->reg->isamc, &isamc_p, isamc_i);
hi->no_insertions++;
- dict_insert (hi->reg->dict, this_name, sizeof(ISAMC_P), &isamc_p);
+ dict_insert (hi->reg->dict, this_name, sizeof(ISAM_P), &isamc_p);
}
}
xfree (isamc_i);
while (hci.more)
{
char this_name[INP_NAME_MAX];
- ISAMC_P isamc_p, isamc_p2;
+ ISAM_P isamc_p, isamc_p2;
char *dict_info;
strcpy (this_name, hci.cur_name);
#endif
if ((dict_info = dict_lookup (hi->reg->dict, hci.cur_name)))
{
- memcpy (&isamc_p, dict_info+1, sizeof(ISAMC_P));
- isamc_p2 = isamb_merge (hi->reg->isamb, isamc_p, isamc_i);
+ memcpy (&isamc_p, dict_info+1, sizeof(ISAM_P));
+ isamc_p2 = isamc_p;
+ isamb_merge (hi->reg->isamb, &isamc_p2, isamc_i);
if (!isamc_p2)
{
hi->no_deletions++;
hi->no_updates++;
if (isamc_p2 != isamc_p)
dict_insert (hi->reg->dict, this_name,
- sizeof(ISAMC_P), &isamc_p2);
+ sizeof(ISAM_P), &isamc_p2);
}
}
else
{
- isamc_p = isamb_merge (hi->reg->isamb, 0, isamc_i);
+ isamc_p = 0;
+ isamb_merge (hi->reg->isamb, &isamc_p, isamc_i);
hi->no_insertions++;
- dict_insert (hi->reg->dict, this_name, sizeof(ISAMC_P), &isamc_p);
+ dict_insert (hi->reg->dict, this_name, sizeof(ISAM_P), &isamc_p);
}
}
xfree (isamc_i);
while (hci.more)
{
char this_name[INP_NAME_MAX];
- ISAMS_P isams_p;
+ ISAM_P isams_p;
char *dict_info;
strcpy (this_name, hci.cur_name);
{
isams_p = isams_merge (hi->reg->isams, isams_i);
hi->no_insertions++;
- dict_insert (hi->reg->dict, this_name, sizeof(ISAMS_P), &isams_p);
+ dict_insert (hi->reg->dict, this_name, sizeof(ISAM_P), &isams_p);
}
else
{