projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added dynamic memory allocation on encoding (whew). Code is now somewhat
[yaz-moved-to-github.git]
/
odr
/
ber_bit.c
diff --git
a/odr/ber_bit.c
b/odr/ber_bit.c
index
4549f74
..
db58414
100644
(file)
--- a/
odr/ber_bit.c
+++ b/
odr/ber_bit.c
@@
-4,7
+4,11
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: ber_bit.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: ber_bit.c,v $
- * Revision 1.3 1995-03-08 12:12:04 quinn
+ * Revision 1.4 1995-04-18 08:15:13 quinn
+ * Added dynamic memory allocation on encoding (whew). Code is now somewhat
+ * neater. We'll make the same change for decoding one day.
+ *
+ * Revision 1.3 1995/03/08 12:12:04 quinn
* Added better error checking.
*
* Revision 1.2 1995/02/03 17:04:31 quinn
* Added better error checking.
*
* Revision 1.2 1995/02/03 17:04:31 quinn
@@
-63,25
+67,14
@@
int ber_bitstring(ODR o, Odr_bitmask *p, int cons)
o->left -= len;
return 1;
case ODR_ENCODE:
o->left -= len;
return 1;
case ODR_ENCODE:
- if ((res = ber_enclen(o->bp, p->top + 2, 5, 0)) < 0)
- {
- o->error = OOTHER;
+ if ((res = ber_enclen(o, p->top + 2, 5, 0)) < 0)
return 0;
return 0;
- }
- o->bp += res;
- o->left -= res;
- if (p->top + 2 > o->left)
- {
- o->error = OSPACE;
+ if (odr_putc(o, 0) < 0) /* no unused bits here */
return 0;
return 0;
- }
- *(o->bp++) = 0; /* no unused bits here */
- o->left--;
if (p->top < 0)
return 1;
if (p->top < 0)
return 1;
- memcpy(o->bp, p->bits, p->top + 1);
- o->bp += p->top + 1;
- o->left -= p->top +1;
+ if (odr_write(o, p->bits, p->top + 1) < 0)
+ return 0;
return 1;
case ODR_PRINT: return 1;
default: o->error = OOTHER; return 0;
return 1;
case ODR_PRINT: return 1;
default: o->error = OOTHER; return 0;