X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fdumpber.c;h=a6901e7e359849326a75a305c5983171492c91c0;hp=a60cb3c6f3c6963b57cd1ac86735407bb5aeb84b;hb=5c1eb188e9cf6f0dd2e435a1f81938f258515edb;hpb=8d691989077a0addcbd840d769dce6700f3d9622

diff --git a/src/dumpber.c b/src/dumpber.c
index a60cb3c..a6901e7 100644
--- a/src/dumpber.c
+++ b/src/dumpber.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: dumpber.c,v 1.5 2007-01-03 08:42:15 adam Exp $
  */
 
 /**
@@ -20,20 +18,26 @@
 static int do_dumpBER(FILE *f, const char *buf, int len, int level, int offset)
 {
     int res, ll, zclass, tag, cons, lenlen, taglen;
-    const char *b = buf, *bp = buf;
-    
+    const char *b = buf;
+    char level_str[80];
+
+    if (level >= 15)
+        sprintf(level_str, "level=%-6d%*s", level, 18, "");
+    else
+        sprintf(level_str, "%*s", level * 2, "");
+
     if (!len)
         return 0;
     if (!buf[0] && !buf[1])
         return 0;
-    if ((res = ber_dectag((unsigned char*)b, &zclass, &tag, &cons, len)) <= 0)
+    if ((res = ber_dectag(b, &zclass, &tag, &cons, len)) <= 0)
         return 0;
     if (res > len)
     {
-        fprintf(stderr, "Unexpected end of buffer\n");
+        fprintf(f, "%5d: %s : Unexpected end of buffer\n", offset, level_str);
         return 0;
     }
-    fprintf(f, "%5d: %*s", offset, level * 4, "");
+    fprintf(f, "%5d: %s", offset, level_str);
     if (zclass == ODR_UNIVERSAL)
     {
         static char *nl[] =
@@ -58,10 +62,9 @@ static int do_dumpBER(FILE *f, const char *buf, int len, int level, int offset)
     b += res;
     taglen = res;
     len -= res;
-    bp = b;
-    if ((res = ber_declen((unsigned char*)b, &ll, len)) <= 0)
+    if ((res = ber_declen(b, &ll, len)) <= 0)
     {
-        fprintf(f, "\n%*sBad length\n", level*4+5, "");
+        fprintf(f, "\n%sBad length\n", level_str);
         return 0;
     }
     lenlen = res;
@@ -71,13 +74,13 @@ static int do_dumpBER(FILE *f, const char *buf, int len, int level, int offset)
         fprintf(f, " len=%d", ll);
     else
         fprintf(f, " len=?");
-    fprintf(f, "       tl=%d, ll=%d cons=%d\n", taglen, lenlen, cons);
+    fprintf(f, " tl=%d, ll=%d cons=%d\n", taglen, lenlen, cons);
     if (!cons)
     {
         if (ll < 0 || ll > len)
         {
-            fprintf(f, "%*sBad length on primitive type. ll=%d len=%d\n",
-                    level*4+5, "", ll, len);
+            fprintf(f, "%sBad length on primitive type. ll=%d len=%d\n",
+                    level_str, ll, len);
             return 0;
         }
         return ll + (b - buf);
@@ -86,8 +89,8 @@ static int do_dumpBER(FILE *f, const char *buf, int len, int level, int offset)
     {
         if (ll > len)
         {
-            fprintf(f, "%*sBad length of constructed type ll=%d len=%d.\n",
-                    level*4+5, "", ll, len);
+            fprintf(f, "%sBad length of constructed type ll=%d len=%d\n",
+                    level_str, ll, len);
             return 0;
         }
         len = ll;
@@ -99,14 +102,14 @@ static int do_dumpBER(FILE *f, const char *buf, int len, int level, int offset)
             break;
         if (!(res = do_dumpBER(f, b, len, level + 1, offset + (b - buf))))
         {
-            fprintf(f, "%*sDump of content element failed.\n", level*4+5, "");
+            fprintf(f, "%s Dump of content element failed\n", level_str);
             return 0;
         }
         b += res;
         len -= res;
         if (len < 0)
         {
-            fprintf(f, "%*sBad length\n", level*4+5, "");
+            fprintf(f, "%sBad length\n", level_str);
             return 0;
         }
     }
@@ -114,8 +117,8 @@ static int do_dumpBER(FILE *f, const char *buf, int len, int level, int offset)
     {
         if (len < 2)
         {
-            fprintf(f, "%*sBuffer too short in indefinite length.\n",
-                    level*4+5, "");
+            fprintf(f, "%sBuffer too short in indefinite length\n",
+                    level_str);
             return 0;
         }
         return (b - buf) + 2;
@@ -130,6 +133,7 @@ int odr_dumpBER(FILE *f, const char *buf, int len)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab