Fix: Setting env YAZ_LOG makes YAZ hang YAZ-745

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

diff --git a/src/odr_null.c b/src/odr_null.c
index cc33ff7..bd8859e 100644 (file)
--- a/src/odr_null.c
+++ b/src/odr_null.c
@@ -1,9 +1,10 @@
-/*
- * Copyright (c) 1995-2003, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Id: odr_null.c,v 1.1 2003-10-27 12:21:33 adam Exp $
+ */
+/**
+ * \file odr_null.c
+ * \brief Implements ODR NULL codec
  */
 #if HAVE_CONFIG_H
 #include <config.h>
@@ -20,32 +21,42 @@ int odr_null(ODR o, Odr_null **p, int opt, const char *name)
     int res, cons = 0;
 
     if (o->error)
-       return 0;
-    if (o->t_class < 0)
+        return 0;
+    if (o->op->t_class < 0)
     {
-       o->t_class = ODR_UNIVERSAL;
-       o->t_tag = ODR_NULL;
+        o->op->t_class = ODR_UNIVERSAL;
+        o->op->t_tag = ODR_NULL;
     }
-    if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt, name)) < 0)
-       return 0;
+    res = ber_tag(o, p, o->op->t_class, o->op->t_tag, &cons, opt, name);
+    if (res < 0)
+        return 0;
     if (!res)
-       return odr_missing(o, opt, name);
+        return odr_missing(o, opt, name);
     if (o->direction == ODR_PRINT)
     {
-       odr_prname(o, name);
-       fprintf(o->print, "NULL\n");
-       return 1;
+        odr_prname(o, name);
+        odr_printf(o, "NULL\n");
+        return 1;
     }
     if (cons)
     {
 #ifdef ODR_STRICT_NULL
         odr_seterror(OPROTO, 42);
-       return 0;
+        return 0;
 #else
-       fprintf(stderr, "odr: Warning: Bad NULL\n");
+        /* Warning: Bad NULL */
 #endif
     }
     if (o->direction == ODR_DECODE)
-       *p = odr_nullval();
+        *p = odr_nullval();
     return ber_null(o);
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+