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
Update RPM requires
[yaz-moved-to-github.git]
/
src
/
ber_null.c
diff --git
a/src/ber_null.c
b/src/ber_null.c
index
7797e13
..
6e54de3
100644
(file)
--- a/
src/ber_null.c
+++ b/
src/ber_null.c
@@
-1,11
+1,9
@@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: ber_null.c,v 1.4 2005-06-25 15:46:03 adam Exp $
*/
*/
-/**
+/**
* \file ber_null.c
* \brief Implements ber_null
*
* \file ber_null.c
* \brief Implements ber_null
*
@@
-18,7
+16,7
@@
#include "odr-priv.h"
#include "odr-priv.h"
-/**
+/**
* ber_null: BER-en/decoder for NULL type.
*/
int ber_null(ODR o)
* ber_null: BER-en/decoder for NULL type.
*/
int ber_null(ODR o)
@@
-28,9
+26,6
@@
int ber_null(ODR o)
case ODR_ENCODE:
if (odr_putc(o, 0X00) < 0)
return 0;
case ODR_ENCODE:
if (odr_putc(o, 0X00) < 0)
return 0;
-#ifdef ODR_DEBUG
- fprintf(stderr, "[NULL]\n");
-#endif
return 1;
case ODR_DECODE:
if (odr_max(o) < 1)
return 1;
case ODR_DECODE:
if (odr_max(o) < 1)
@@
-38,14
+33,11
@@
int ber_null(ODR o)
odr_seterror(o, OPROTO, 39);
return 0;
}
odr_seterror(o, OPROTO, 39);
return 0;
}
- if (*(o->bp++) != 0X00)
+ if (*(o->op->bp++) != 0X00)
{
odr_seterror(o, OPROTO, 12);
return 0;
}
{
odr_seterror(o, OPROTO, 12);
return 0;
}
-#ifdef ODR_DEBUG
- fprintf(stderr, "[NULL]\n");
-#endif
return 1;
case ODR_PRINT:
return 1;
return 1;
case ODR_PRINT:
return 1;
@@
-57,6
+49,7
@@
int ber_null(ODR o)
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab