Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz

[yaz-moved-to-github.git] / src / ber_null.c

diff --git a/src/ber_null.c b/src/ber_null.c
index 3e694b6..94fa80c 100644 (file)
--- a/src/ber_null.c
+++ b/src/ber_null.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (c) 1995-2004, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2010 Index Data
  * See the file LICENSE for details.
- *
- * $Id: ber_null.c,v 1.2 2004-10-15 00:18:59 adam Exp $
  */
 
 /** 
@@ -28,9 +26,6 @@ int ber_null(ODR o)
     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)
@@ -43,14 +38,20 @@ int ber_null(ODR o)
             odr_seterror(o, OPROTO, 12);
             return 0;
         }
-#ifdef ODR_DEBUG
-        fprintf(stderr, "[NULL]\n");
-#endif
         return 1;
     case ODR_PRINT:
-       return 1;
+        return 1;
     default:
-       odr_seterror(o, OOTHER, 13);
-       return 0;
+        odr_seterror(o, OOTHER, 13);
+        return 0;
     }
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+