Separate malloc debug library. Removal of ASN_COMPILED-#ifdefs.

[yaz-moved-to-github.git] / zutil / query.c

diff --git a/zutil/query.c b/zutil/query.c
index d0fd48e..a3b8338 100644 (file)
--- a/zutil/query.c
+++ b/zutil/query.c
@@ -1,28 +1,8 @@
 /*
- * Copyright (c) 1995-1999, Index Data
+ * Copyright (c) 1995-2001, Index Data
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: query.c,v $
- * Revision 1.3  1999-12-16 23:36:19  adam
- * Implemented ILL protocol. Minor updates ASN.1 compiler.
- *
- * Revision 1.2  1999/06/09 14:01:33  adam
- * Fixed for compiled ASN.1.
- *
- * Revision 1.1  1999/06/08 10:10:16  adam
- * New sub directory zutil. Moved YAZ Compiler to be part of YAZ tree.
- *
- * Revision 1.3  1996/01/02 11:46:56  quinn
- * Changed 'operator' to 'roperator' to avoid C++ conflict.
- *
- * Revision 1.2  1995/05/16  08:51:14  quinn
- * License, documentation, and memory fixes
- *
- * Revision 1.1  1995/04/10  10:28:47  quinn
- * Added copy of CCL and MARC display
- *
  *
+ * $Id: query.c,v 1.4 2001-11-13 23:00:43 adam Exp $
  */
 
 #include <stdio.h>
@@ -67,14 +47,9 @@ static Z_Operand *makesimple(ODR o, char **buf)
     (*buf)++;
     r->which = Z_Operand_APT;
     r->u.attributesPlusTerm = t = odr_malloc(o, sizeof(*t));
-#ifdef ASN_COMPILED
     t->attributes = odr_malloc(o, sizeof(*t));
     t->attributes->num_attributes = 0;
     t->attributes->attributes = 0;
-#else
-    t->num_attributes = 0;
-    t->attributeList = 0;
-#endif
     t->term = odr_malloc(o, sizeof(*t->term));
     t->term->which = Z_Term_general;
     t->term->u.general = odr_malloc(o, sizeof(Odr_oct));