X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fdumpber.c;h=47ca85194b0254a76ed12ff30b0d02109b55dc8b;hb=113640450c45ca7ac96285cc8ca666bfd597ed21;hp=b52cabdb3e391feb32084f82da6a0fceea1cb5e2;hpb=3d0077a6eb90bf1cf4d2ecc3acd1afaf7c829bd0;p=yaz-moved-to-github.git

diff --git a/odr/dumpber.c b/odr/dumpber.c
index b52cabd..47ca851 100644
--- a/odr/dumpber.c
+++ b/odr/dumpber.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dumpber.c,v $
- * Revision 1.5  1995-10-18 16:12:55  quinn
+ * Revision 1.8  1997-05-14 06:53:57  adam
+ * C++ support.
+ *
+ * Revision 1.7  1996/03/08 14:38:41  quinn
+ * Fixed output.
+ *
+ * Revision 1.6  1996/01/19  15:41:34  quinn
+ * dumpber was ignoring the file argument.
+ *
+ * Revision 1.5  1995/10/18  16:12:55  quinn
  * Better diagnostics. Added special case in NULL to handle WAIS server.
  *
  * Revision 1.4  1995/09/29  17:12:21  quinn
@@ -27,26 +36,26 @@
 
 static int do_dumpBER(FILE *f, char *buf, int len, int level, int offset)
 {
-    int res, ll, class, tag, cons;
+    int res, ll, zclass, tag, cons;
     char *b = buf;
     
     if (!len)
     	return 0;
     if (!buf[0] && !buf[1])
     	return 0;
-    if ((res = ber_dectag((unsigned char*)b, &class, &tag, &cons)) <= 0)
+    if ((res = ber_dectag((unsigned char*)b, &zclass, &tag, &cons)) <= 0)
     	return 0;
     if (res > len)
     {
     	fprintf(stderr, "Unexpected end of buffer\n");
     	return 0;
     }
-    fprintf(stderr, "%5d: %*s", offset, level * 4, "");
-    if (class == ODR_UNIVERSAL)
+    fprintf(f, "%5d: %*s", offset, level * 4, "");
+    if (zclass == ODR_UNIVERSAL)
     {
     	static char *nl[] =
 	{
-	    "Ugh", "BOOLEAN", "INTEGER", "BIT STRING", "OCTET STRING",
+	    "[Univ 0]", "BOOLEAN", "INTEGER", "BIT STRING", "OCTET STRING",
 	    "NULL", "OID", "OBJECT DESCIPTOR", "EXTERNAL", "REAL",
 	    "ENUM", "[UNIV 11]", "[UNIV 12]", "[UNIV 13]", "[UNIV 14]",
 	    "[UNIV 15]", "SEQUENCE", "SET", "NUMERICSTRING", "PRINTABLESTRING",
@@ -55,37 +64,37 @@ static int do_dumpBER(FILE *f, char *buf, int len, int level, int offset)
 	};
 
 	if (tag < 28)
-	    fprintf(stderr, "%s", nl[tag]);
+	    fprintf(f, "%s", nl[tag]);
 	else
-	    fprintf(stderr, "[UNIV %d]", tag);
+	    fprintf(f, "[UNIV %d]", tag);
     }
-    else if (class == ODR_CONTEXT)
-	fprintf(stderr, "[%d]", tag);
+    else if (zclass == ODR_CONTEXT)
+	fprintf(f, "[%d]", tag);
     else
-	fprintf(stderr, "[%d:%d]", class, tag);
+	fprintf(f, "[%d:%d]", zclass, tag);
     b += res;
     len -= res;
     if ((res = ber_declen((unsigned char*)b, &ll)) <= 0)
     {
-    	fprintf(stderr, "bad length\n");
+    	fprintf(f, "bad length\n");
     	return 0;
     }
     if (res > len)
     {
-    	fprintf(stderr, "Unexpected end of buffer\n");
+    	fprintf(f, "Unexpected end of buffer\n");
     	return 0;
     }
     b += res;
     len -= res;
     if (ll >= 0)
-    	fprintf(stderr, " len=%d\n", ll);
+    	fprintf(f, " len=%d\n", ll);
     else
-    	fprintf(stderr, " len=?\n");
+    	fprintf(f, " len=?\n");
     if (!cons)
     {
     	if (ll < 0)
 	{
-	    fprintf(stderr, "Bad length on primitive type.\n");
+	    fprintf(f, "Bad length on primitive type.\n");
 	    return 0;
 	}
     	return ll + (b - buf);
@@ -99,7 +108,7 @@ static int do_dumpBER(FILE *f, char *buf, int len, int level, int offset)
 	    break;
 	if (!(res = do_dumpBER(f, b, len, level + 1, offset + (b - buf))))
 	{
-	    fprintf(stderr, "Dump of content element failed.\n");
+	    fprintf(f, "Dump of content element failed.\n");
 	    return 0;
 	}
 	b += res;
@@ -109,7 +118,7 @@ static int do_dumpBER(FILE *f, char *buf, int len, int level, int offset)
     {
     	if (len < 2)
 	{
-	    fprintf(stderr, "Buffer too short in indefinite lenght.\n");
+	    fprintf(f, "Buffer too short in indefinite lenght.\n");
 	    return 0;
 	}
 	return (b - buf) + 2;