X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fkinput.c;h=5469b5058ab1924cfe399c4909519478c52e301d;hb=9eaf65aa25be411fbd6298292f5ad7a7df7083ed;hp=f98c0d557a45b275a8491b0606fe4919913ae0a6;hpb=9b7dbbec2a6a910a2883ea3da5e6136e9240f820;p=idzebra-moved-to-github.git

diff --git a/index/kinput.c b/index/kinput.c
index f98c0d5..5469b50 100644
--- a/index/kinput.c
+++ b/index/kinput.c
@@ -1,5 +1,5 @@
-/* $Id: kinput.c,v 1.73 2006-05-09 08:12:22 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: kinput.c,v 1.77 2006-10-29 17:20:01 adam Exp $
+   Copyright (C) 1995-2006
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 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 <fcntl.h>
@@ -258,7 +258,7 @@ struct heap_info {
     int no_iterations;
 };
 
-static struct heap_info *key_heap_malloc()
+static struct heap_info *key_heap_malloc(void)
 {  /* malloc and clear it */
     struct heap_info *hi;
     hi = (struct heap_info *) xmalloc (sizeof(*hi));
@@ -603,7 +603,7 @@ int heap_inpc (struct heap_cread_info *hci, struct heap_info *hi)
         char *dict_info;
 
         strcpy (this_name, hci->cur_name);
-	assert (hci->cur_name[1]);
+	assert (hci->cur_name[0]);
         hi->no_diffs++;
         if ((dict_info = dict_lookup (hi->reg->dict, hci->cur_name)))
         {
@@ -648,7 +648,7 @@ int heap_inp0(struct heap_cread_info *hci, struct heap_info *hi)
 	int mode;
 
         strcpy (this_name, hci->cur_name);
-	assert (hci->cur_name[1]);
+	assert (hci->cur_name[0]);
         hi->no_diffs++;
 
 	while (heap_cread_item2(hci, &dst, &mode))
@@ -672,7 +672,7 @@ int heap_inpb(struct heap_cread_info *hci, struct heap_info *hi)
         char *dict_info;
 
         strcpy (this_name, hci->cur_name);
-	assert (hci->cur_name[1]);
+	assert (hci->cur_name[0]);
         hi->no_diffs++;
 
 #if 0
@@ -726,7 +726,7 @@ int heap_inps (struct heap_cread_info *hci, struct heap_info *hi)
         char *dict_info;
 
         strcpy (this_name, hci->cur_name);
-	assert (hci->cur_name[1]);
+	assert (hci->cur_name[0]);
         hi->no_diffs++;
         if (!(dict_info = dict_lookup (hi->reg->dict, hci->cur_name)))
         {
@@ -885,3 +885,11 @@ void zebra_index_merge (ZebraHandle zh)
 
     key_heap_destroy (hi, nkeys);
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+