From: Sebastian Hammer <quinn@indexdata.com>
Date: Tue, 11 Apr 1995 11:52:01 +0000 (+0000)
Subject: Fixed possible buf in proto.c
X-Git-Tag: YAZ.1.8~1066
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=d32b1dbdc1f0392883547cc9e56c26f384a4c57f;hp=7d093cf64e6045cf14dbf199f8cdf6b808dd3b65

Fixed possible buf in proto.c
---

diff --git a/asn/Makefile b/asn/Makefile
index 89e4bff..9fbab3b 100644
--- a/asn/Makefile
+++ b/asn/Makefile
@@ -1,7 +1,7 @@
 # Copyright (C) 1994, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.9 1995-04-10 10:22:21 quinn Exp $
+# $Id: Makefile,v 1.10 1995-04-11 11:52:01 quinn Exp $
 
 SHELL=/bin/sh
 INCLUDE=-I../include -I.
@@ -32,7 +32,7 @@ $(LIB): $(PO)
 clean:
 	rm -f *.[oa] test core mon.out gmon.out errlist
 
-depend: depend1
+depend: depend2
 
 depend1:
 	mv Makefile Makefile.tmp
@@ -43,25 +43,8 @@ depend1:
 depend2:
 	$(CPP) $(INCLUDE) -M *.c >.depend	
 
-#ifeq (.depend,$(wildcard .depend))
-#include .depend
-#endif
+ifeq (.depend,$(wildcard .depend))
+include .depend
+endif
 
 #Depend --- DOT NOT DELETE THIS LINE
-diagbib1.o : diagbib1.c /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \
-  /usr/include/libio.h /usr/include/_G_config.h ../include/diagbib1.h 
-oid.o : oid.c ../include/oid.h ../include/odr.h /usr/include/stdio.h /usr/include/features.h \
-  /usr/include/sys/cdefs.h /usr/include/libio.h /usr/include/_G_config.h /usr/include/string.h \
-  /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h ../include/prt.h ../include/dmalloc.h 
-pnew.o : pnew.c ../include/odr.h /usr/include/stdio.h /usr/include/features.h \
-  /usr/include/sys/cdefs.h /usr/include/libio.h /usr/include/_G_config.h /usr/include/string.h \
-  /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h ../include/prt.h ../include/dmalloc.h \
-  ../include/proto.h ../include/odr_use.h 
-proto.o : proto.c ../include/odr.h /usr/include/stdio.h /usr/include/features.h \
-  /usr/include/sys/cdefs.h /usr/include/libio.h /usr/include/_G_config.h /usr/include/string.h \
-  /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h ../include/prt.h ../include/dmalloc.h \
-  ../include/proto.h ../include/odr_use.h 
-test.o : test.c /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \
-  /usr/include/libio.h /usr/include/_G_config.h ../include/odr.h /usr/include/string.h \
-  /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h ../include/prt.h ../include/dmalloc.h \
-  ../include/odr_use.h ../include/proto.h 
diff --git a/asn/proto.c b/asn/proto.c
index fe086fa..dcf6111 100644
--- a/asn/proto.c
+++ b/asn/proto.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: proto.c,v $
- * Revision 1.17  1995-04-10 10:22:22  quinn
+ * Revision 1.18  1995-04-11 11:52:02  quinn
+ * Fixed possible buf in proto.c
+ *
+ * Revision 1.17  1995/04/10  10:22:22  quinn
  * Added SCAN.
  *
  * Revision 1.16  1995/03/30  10:26:43  quinn
@@ -639,7 +642,7 @@ int z_AlternativeTerm(ODR o, Z_AlternativeTerm **p, int opt)
     	&(*p)->num_terms))
     	return 1;
     *p = 0;
-    return 0;
+    return opt && !o->error;
 }
 
 int z_OccurrenceByAttributes(ODR o, Z_OccurrenceByAttributes **p, int opt)
@@ -710,7 +713,7 @@ int z_DiagRecs(ODR o, Z_DiagRecs **p, int opt)
     else if (!*p)
     	return opt;
 
-    if (odr_sequence_of(o, z_DiagRec, &(*p)->diagRecs,
+	if (odr_sequence_of(o, z_DiagRec, &(*p)->diagRecs,
     	&(*p)->num_diagRecs))
     	return 1;
     *p = 0;