/*
- * Copyright (C) 1994, Index Data I/S
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_choice.c,v $
- * Revision 1.3 1995-03-08 12:12:22 quinn
+ * Revision 1.6 1995-05-16 08:50:53 quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.5 1995/03/18 12:16:31 quinn
+ * Minor changes.
+ *
+ * Revision 1.4 1995/03/14 16:59:38 quinn
+ * Added odr_constructed_more check
+ *
+ * Revision 1.3 1995/03/08 12:12:22 quinn
* Added better error checking.
*
* Revision 1.2 1995/02/09 15:51:48 quinn
#include <odr.h>
-int odr_choice(ODR o, Odr_arm arm[], void *p, int *which)
+int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp)
{
- int i, cl = -1, tg, cn;
+ int i, cl = -1, tg, cn, *which = whichp;
if (o->error)
return 0;
{
if (o->direction == ODR_DECODE && cl < 0)
{
+ if (o->stackp > -1 && !odr_constructed_more(o))
+ return 0;
if (ber_dectag(o->bp, &cl, &tg, &cn) <= 0)
return 0;
}