-/* $Id: delete.c,v 1.8 2002-08-02 19:26:55 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
+/* $Id: delete.c,v 1.14 2007-01-15 15:10:15 adam Exp $
+ Copyright (C) 1995-2007
+ Index Data ApS
This file is part of the Zebra server.
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
-*/
-
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+*/
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <assert.h>
-#include <dict.h>
+#include "dict-p.h"
static void dict_del_subtree (Dict dict, Dict_ptr ptr,
void *client,
int (*f)(const char *, void *))
{
- int more = 1;
void *p = 0;
+ short *indxp;
+ int i, hi;
if (!ptr)
return;
-
- while (more)
- {
- short *indxp;
- int i, hi;
- dict_bf_readp (dict->dbf, ptr, &p);
- hi = DICT_nodir(p)-1;
- indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
- more = 0;
- for (i = 0; i <= hi; i++)
+ dict_bf_readp (dict->dbf, ptr, &p);
+ indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
+ hi = DICT_nodir(p)-1;
+ for (i = 0; i <= hi; i++)
+ {
+ if (indxp[-i] > 0)
+ {
+ /* string (Dict_char *) DICT_EOS terminated */
+ /* unsigned char length of information */
+ /* char * information */
+ char *info = (char*)p + indxp[-i];
+ if (f)
+ (*f)(info + (dict_strlen((Dict_char*) info)+1)
+ *sizeof(Dict_char), client);
+ }
+ else
{
- if (indxp[-i] > 0)
+ Dict_ptr subptr;
+
+ /* Dict_ptr subptr */
+ /* Dict_char sub char */
+ /* unsigned char length of information */
+ /* char * information */
+ char *info = (char*)p - indxp[-i];
+ memcpy (&subptr, info, sizeof(Dict_ptr));
+
+ if (info[sizeof(Dict_ptr)+sizeof(Dict_char)])
{
- /* string (Dict_char *) DICT_EOS terminated */
- /* unsigned char length of information */
- /* char * information */
- char *info = (char*)p + indxp[-i];
if (f)
- (*f)(info + (dict_strlen((Dict_char*) info)+1)
- *sizeof(Dict_char), client);
+ (*f)(info+sizeof(Dict_ptr)+sizeof(Dict_char), client);
}
- else
+ if (subptr)
{
-
- Dict_ptr subptr;
-
- /* Dict_ptr subptr */
- /* Dict_char sub char */
- /* unsigned char length of information */
- /* char * information */
- char *info = (char*)p - indxp[-i];
- memcpy (&subptr, info, sizeof(Dict_ptr));
-
- if (info[sizeof(Dict_ptr)+sizeof(Dict_char)])
- {
- if (f)
- (*f)(info+sizeof(Dict_ptr)+sizeof(Dict_char), client);
- }
- if (subptr)
- {
- dict_del_subtree (dict, subptr, client, f);
- more = 1;
- break;
- }
+ dict_del_subtree (dict, subptr, client, f);
+
+ /* page may be gone. reread it .. */
+ dict_bf_readp (dict->dbf, ptr, &p);
+ indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
}
}
}
return dict_del_string (dict, (const Dict_char*) p, dict->head.root, 1,
client, f);
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+