X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=dict%2Fdelete.c;h=55743fa43a01967a080d521b6133ccab20f801e4;hp=b8ac9da849f08ce473b7fdaa75b9ea1dd46920f7;hb=0dedb6a7a6a0f0ddaf56cb0673978fdd85e64be1;hpb=6e88e0163a9e3c23963fcb37fe94c936d65dfcc3

diff --git a/dict/delete.c b/dict/delete.c
index b8ac9da..55743fa 100644
--- a/dict/delete.c
+++ b/dict/delete.c
@@ -1,5 +1,5 @@
 /* This file is part of the Zebra server.
-   Copyright (C) 1994-2011 Index Data
+   Copyright (C) Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -17,6 +17,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ -25,16 +28,16 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "dict-p.h"
 
 static void dict_del_subtree(Dict dict, Dict_ptr ptr,
-                             void *client, 
+                             void *client,
                              int (*f)(const char *, void *))
 {
     void *p = 0;
     short *indxp;
     int i, hi;
-    
+
     if (!ptr)
 	return;
-	
+
     dict_bf_readp(dict->dbf, ptr, &p);
     indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
     hi = DICT_nodir(p)-1;
@@ -53,14 +56,14 @@ static void dict_del_subtree(Dict dict, Dict_ptr ptr,
 	else
 	{
 	    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)
@@ -69,7 +72,7 @@ static void dict_del_subtree(Dict dict, Dict_ptr ptr,
 	    if (subptr)
 	    {
 		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));
@@ -82,7 +85,7 @@ static void dict_del_subtree(Dict dict, Dict_ptr ptr,
 }
 
 static int dict_del_string(Dict dict, const Dict_char *str, Dict_ptr ptr,
-                           int sub_flag, void *client, 
+                           int sub_flag, void *client,
                            int (*f)(const char *, void *))
 {
     int mid, lo, hi;
@@ -98,7 +101,7 @@ static int dict_del_string(Dict dict, const Dict_char *str, Dict_ptr ptr,
     dict_bf_readp(dict->dbf, ptr, &p);
     mid = lo = 0;
     hi = DICT_nodir(p)-1;
-    indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));    
+    indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
     while (lo <= hi)
     {
         mid = (lo+hi)/2;
@@ -132,7 +135,7 @@ static int dict_del_string(Dict dict, const Dict_char *str, Dict_ptr ptr,
 		    mid = lo = 0;
                     r = 1; /* signal deleted */
                     /* start again (may not be the most efficient way to go)*/
-		    continue; 
+		    continue;
 		}
 	    }
 	    else
@@ -210,7 +213,7 @@ static int dict_del_string(Dict dict, const Dict_char *str, Dict_ptr ptr,
                     subptr = 0; /* avoid dict_del_subtree (end of function)*/
                     if (r == 2)
                     {   /* subptr page became empty and is removed */
-                        
+
                         /* see if this entry is a real one or if it just
                            serves as pointer to subptr */
                         if (info[sizeof(Dict_ptr)+sizeof(Dict_char)])