/*
- * 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.18 1997-05-14 06:53:58 adam
+ * 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
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 = 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 :