X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsnull.c;h=94d9be89e214fc4c5d55d72811ff3ff70762d988;hb=42632d1251eba8a9b158625dff3344fc747b2b17;hp=578dc7cad293b3ce8ff01b5ab56889df9ed09708;hpb=33b386a95c0aac273527d596ce1aafa0dc567b7b;p=idzebra-moved-to-github.git

diff --git a/rset/rsnull.c b/rset/rsnull.c
index 578dc7c..94d9be8 100644
--- a/rset/rsnull.c
+++ b/rset/rsnull.c
@@ -1,10 +1,19 @@
 /*
- * Copyright (C) 1994-1995, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rsnull.c,v $
- * Revision 1.10  1998-03-05 08:36:28  adam
+ * Revision 1.13  2002-03-21 10:25:42  adam
+ * use lockDir. Fixes for searchResult for null/sort sets
+ *
+ * Revision 1.12  1999/05/26 07:49:14  adam
+ * C++ compilation.
+ *
+ * Revision 1.11  1999/02/02 14:51:36  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.10  1998/03/05 08:36:28  adam
  * New result set model.
  *
  * Revision 1.9  1997/12/18 10:54:25  adam
@@ -76,11 +85,11 @@ const struct rset_control *rset_kind_null = &control;
 
 static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
 {
-    rset_null_parms *null_parms = parms;
+    rset_null_parms *null_parms = (rset_null_parms *) parms;
 
     ct->no_rset_terms = 1;
-    ct->rset_terms = xmalloc (sizeof(*ct->rset_terms));
-    if (parms)
+    ct->rset_terms = (RSET_TERM *) xmalloc (sizeof(*ct->rset_terms));
+    if (parms && null_parms->rset_term)
 	ct->rset_terms[0] = null_parms->rset_term;
     else
 	ct->rset_terms[0] = rset_term_create ("term", -1, "rank-0");