Avoid using non-portable debian.h

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

diff --git a/src/ber_len.c b/src/ber_len.c
index b2f9a52..47c6f0f 100644 (file)
--- a/src/ber_len.c
+++ b/src/ber_len.c
@@ -1,9 +1,9 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
 
-/** 
+/**
  * \file ber_len.c
  * \brief Implements BER length octet encoding and decoding
  *
@@ -81,8 +81,8 @@ int ber_enclen(ODR o, int len, int lenlen, int exact)
 
 /**
  * ber_declen:
- * Decode BER length octets. Returns 
- *  > 0  : number of bytes read 
+ * Decode BER length octets. Returns
+ *  > 0  : number of bytes read
  *   -1  : not enough room to read bytes within max bytes
  *   -2  : other error
  *
@@ -90,9 +90,9 @@ int ber_enclen(ODR o, int len, int lenlen, int exact)
  * len = -1   indefinite length.
  * len >= 0   definite length
  */
-int ber_declen(const unsigned char *buf, int *len, int max)
+int ber_declen(const char *buf, int *len, int max)
 {
-    const unsigned char *b = buf;
+    const unsigned char *b = (const unsigned char *) buf;
     int n;
 
     if (max < 1)
@@ -109,7 +109,7 @@ int ber_declen(const unsigned char *buf, int *len, int max)
     }
     if (*b == 0XFF)     /* reserved value */
         return -2;
-    /* indefinite long form */ 
+    /* indefinite long form */
     n = *b & 0X7F;
     if (n >= max)
         return -1;
@@ -122,11 +122,12 @@ int ber_declen(const unsigned char *buf, int *len, int max)
     }
     if (*len < 0)
         return -2;
-    return (b - buf);
+    return ((const char *) b - buf);
 }
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab