/*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-1997, Index Data
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_seq.c,v $
- * Revision 1.15 1995-09-27 15:03:00 quinn
+ * Revision 1.22 1998-02-11 11:53:34 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.21 1997/11/24 11:33:56 adam
+ * Using function odr_nullval() instead of global ODR_NULLVAL when
+ * appropriate.
+ *
+ * Revision 1.20 1997/09/29 07:17:31 adam
+ * Added typecast to avoid warnings on MSVC.
+ *
+ * Revision 1.19 1997/06/23 10:31:11 adam
+ * Added RVDM's SEQUENCE OF patch again!
+ *
+ * Revision 1.18 1997/05/14 06:53:58 adam
+ * C++ support.
+ *
+ * Revision 1.17 1997/05/05 11:21:09 adam
+ * In handling of SEQUENCE OF: Counter set to zero when SEQUENCE
+ * OF isn't there at all.
+ *
+ * Revision 1.16 1995/09/29 17:12:26 quinn
+ * Smallish
+ *
+ * Revision 1.15 1995/09/27 15:03:00 quinn
* Modified function heads & prototypes.
*
* Revision 1.14 1995/08/15 11:16:39 quinn
#include <odr.h>
#include <assert.h>
-int MDF odr_sequence_begin(ODR o, void *p, int size)
+int odr_sequence_begin(ODR o, void *p, int size)
{
char **pp = (char**) p;
if (odr_constructed_begin(o, p, o->t_class, o->t_tag))
{
if (o->direction == ODR_DECODE && size)
- *pp = odr_malloc(o, size);
+ *pp = (char *)odr_malloc(o, size);
return 1;
}
else
return 0;
}
-int MDF odr_sequence_end(ODR o)
+int odr_sequence_end(ODR o)
{
return odr_constructed_end(o);
}
return odr_constructed_more(o);
}
-int MDF odr_sequence_of(ODR o, Odr_fun type, void *p, int *num)
+int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num)
{
char ***pp = (char***) p; /* for dereferencing */
char **tmp = 0;
int size = 0, i;
- if (!odr_sequence_begin(o, p, 0))
+ if (!odr_sequence_begin(o, p, 0)) {
+ if (o->direction == ODR_DECODE)
+ *num = 0;
return 0;
+ }
switch (o->direction)
{
case ODR_DECODE:
*num = 0;
- *pp = ODR_NULLVAL;
+ *pp = (char **)odr_nullval();
while (odr_sequence_more(o))
{
/* outgrown array? */
- if (*num * sizeof(void*) >= size)
+ if (*num * (int) sizeof(void*) >= size)
{
/* double the buffer size */
- tmp = odr_malloc(o, sizeof(void*) * (size += size ? size :
+ tmp = (char **)odr_malloc(o, sizeof(void*) * (size += size ? size :
128));
if (*num)
{