Remove call to gnutls_global_init. tcpip_init already does it

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

diff --git a/src/odr_null.c b/src/odr_null.c
index bf6df75..bd8859e 100644 (file)
--- a/src/odr_null.c
+++ b/src/odr_null.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
- *
- * $Id: odr_null.c,v 1.7 2007-01-03 08:42:15 adam Exp $
  */
 /**
  * \file odr_null.c
@@ -24,12 +22,13 @@ int odr_null(ODR o, Odr_null **p, int opt, const char *name)
 
     if (o->error)
         return 0;
-    if (o->t_class < 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)
+    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);
@@ -55,6 +54,7 @@ int odr_null(ODR o, Odr_null **p, int opt, const char *name)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab