X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fodr_null.c;h=bd8859e848ec2f7442310fd18952bbd17bfe8196;hp=ef2eb08c545a82e0dfa9670f847554b700e17f01;hb=ab61788b20fce5faedceb7599f6b5f43be72ba9a;hpb=05c274ef315384faafcc5900c17468f0ea2474e6

diff --git a/src/odr_null.c b/src/odr_null.c
index ef2eb08..bd8859e 100644
--- a/src/odr_null.c
+++ b/src/odr_null.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (c) 1995-2004, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
- *
- * $Id: odr_null.c,v 1.4 2004-10-15 00:19:00 adam Exp $
  */
 /**
  * \file odr_null.c
@@ -23,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);
-    	odr_printf(o, "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
-	/* Warning: Bad NULL */
+        /* 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
+ */
+