X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fber_tag.c;h=f005078ec210095b9a6458f15de5418c14ee86c0;hb=a7585fd1220c684189091e7fba2c5d6cf436031e;hp=cdf4dd96bd8c4fd9641d1a5e344ad304bb55e2d4;hpb=8d691989077a0addcbd840d769dce6700f3d9622;p=yaz-moved-to-github.git

diff --git a/src/ber_tag.c b/src/ber_tag.c
index cdf4dd9..f005078 100644
--- a/src/ber_tag.c
+++ b/src/ber_tag.c
@@ -1,11 +1,9 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2013 Index Data
  * See the file LICENSE for details.
- *
- * $Id: ber_tag.c,v 1.7 2007-01-03 08:42:15 adam Exp $
  */
 
-/** 
+/**
  * \file ber_tag.c
  * \brief Implements BER tags encoding and decoding
  *
@@ -42,7 +40,7 @@ int ber_tag(ODR o, void *p, int zclass, int tag, int *constructed, int opt,
 
     if (o->direction == ODR_DECODE)
         *pp = 0;
-    o->t_class = -1;
+    o->op->t_class = -1;
     if (ODR_STACK_EMPTY(o))
     {
         odr_seek(o, ODR_S_SET, 0);
@@ -159,14 +157,15 @@ int ber_enctag(ODR o, int zclass, int tag, int constructed)
     }
 }
 
-/** 
+/**
  * \brief Decodes BER identifier octets.
  *
  * Returns number of bytes read or -1 for error.
  */
-int ber_dectag(const unsigned char *b, int *zclass, int *tag,
+int ber_dectag(const char *cp, int *zclass, int *tag,
                int *constructed, int max)
 {
+    const unsigned char *b = (const unsigned char *) cp;
     int l = 1;
 
     if (l > max)
@@ -190,6 +189,7 @@ int ber_dectag(const unsigned char *b, int *zclass, int *tag,
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab