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 yaz_errno
[yaz-moved-to-github.git]
/
odr
/
ber_null.c
diff --git
a/odr/ber_null.c
b/odr/ber_null.c
index
2fbaf6d
..
bd334c9
100644
(file)
--- a/
odr/ber_null.c
+++ b/
odr/ber_null.c
@@
-1,53
+1,41
@@
/*
/*
- * Copyright (C) 1994, Index Data I/S
- * All rights reserved.
+ * Copyright (c) 1995-2002, Index Data
+ * See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* Sebastian Hammer, Adam Dickmeiss
*
- * $Log: ber_null.c,v $
- * Revision 1.3 1995-03-08 12:12:09 quinn
- * Added better error checking.
- *
- * Revision 1.2 1995/02/09 15:51:46 quinn
- * Works better now.
- *
- * Revision 1.1 1995/02/02 16:21:52 quinn
- * First kick.
- *
+ * $Id: ber_null.c,v 1.12 2002-07-25 12:51:08 adam Exp $
*/
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
-#include <odr.h>
+#include "odr-priv.h"
/*
* BER-en/decoder for NULL type.
*/
/*
* BER-en/decoder for NULL type.
*/
-int ber_null(ODR o, int *val)
+int ber_null(ODR o)
{
switch (o->direction)
{
{
switch (o->direction)
{
- case ODR_ENCODE:
- if (!o->left)
- {
- o->error = OSPACE;
- return 0;
- }
- *(o->bp++) = 0X00;
- o->left--;
+ case ODR_ENCODE:
+ if (odr_putc(o, 0X00) < 0)
+ return 0;
#ifdef ODR_DEBUG
#ifdef ODR_DEBUG
- fprintf(stderr, "[NULL]\n");
+ fprintf(stderr, "[NULL]\n");
#endif
#endif
- return 1;
- case ODR_DECODE:
- if (*(o->bp++) != 0X00)
- {
- o->error = OPROTO;
- return 0;
- }
- o->left--;
+ return 1;
+ case ODR_DECODE:
+ if (*(o->bp++) != 0X00)
+ {
+ o->error = OPROTO;
+ return 0;
+ }
#ifdef ODR_DEBUG
#ifdef ODR_DEBUG
- fprintf(stderr, "[NULL]\n");
+ fprintf(stderr, "[NULL]\n");
#endif
#endif
- 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;
}
}
}
}