X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_oct.c;h=7fd03f88dd2c6f9ae3d116f6c786477b3681a1a3;hb=695e6df9fce9b838cb3fe8f49b211ed99943caef;hp=c1242d2fe11381f24c2892627bdacecf257b6055;hpb=99268f722648e84bf5c54eb685a1434e100f38a1;p=yaz-moved-to-github.git

diff --git a/odr/odr_oct.c b/odr/odr_oct.c
index c1242d2..7fd03f8 100644
--- a/odr/odr_oct.c
+++ b/odr/odr_oct.c
@@ -1,10 +1,32 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-2000, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_oct.c,v $
- * Revision 1.9  1995-05-16 08:50:56  quinn
+ * Revision 1.16  2000-02-29 13:44:55  adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.15  1999/11/30 13:47:11  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.14  1999/10/19 12:35:55  adam
+ * Better dump of OCTET STRING.
+ *
+ * Revision 1.13  1999/04/20 09:56:48  adam
+ * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
+ * Modified all encoders/decoders to reflect this change.
+ *
+ * Revision 1.12  1998/02/11 11:53:34  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.11  1995/09/29 17:12:25  quinn
+ * Smallish
+ *
+ * Revision 1.10  1995/09/27  15:02:59  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.9  1995/05/16  08:50:56  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.8  1995/03/17  10:17:54  quinn
@@ -32,14 +54,17 @@
  * First kick.
  *
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
+#include <yaz/odr.h>
 
 /*
  * Top level octet string en/decoder.
  * Returns 1 on success, 0 on error.
  */
-int odr_octetstring(ODR o, Odr_oct **p, int opt)
+int odr_octetstring(ODR o, Odr_oct **p, int opt, const char *name)
 {
     int res, cons = 0;
 
@@ -56,12 +81,24 @@ int odr_octetstring(ODR o, Odr_oct **p, int opt)
     	return opt;
     if (o->direction == ODR_PRINT)
     {
-    	fprintf(o->print, "%sOCTETSTRING(len=%d)\n", odr_indent(o), (*p)->len);
+        int i;
+	odr_prname(o, name);
+    	fprintf(o->print, "OCTETSTRING(len=%d)", (*p)->len);
+        for (i = 0; i<(*p)->len; i++)
+        {
+	    if (i < 5 || i > ((*p)->len - 4))
+            {
+                fprintf (o->print, " %02X", (*p)->buf[i]);
+            }
+            else if (i == 5)
+                fprintf (o->print, " .. ");
+        }
+        fprintf(o->print, "\n");
     	return 1;
     }
     if (o->direction == ODR_DECODE)
     {
-    	*p = odr_malloc(o, sizeof(Odr_oct));
+    	*p = (Odr_oct *)odr_malloc(o, sizeof(Odr_oct));
     	(*p)->size= 0;
     	(*p)->len = 0;
     	(*p)->buf = 0;
@@ -75,7 +112,7 @@ int odr_octetstring(ODR o, Odr_oct **p, int opt)
 /*
  * Friendlier interface to octetstring.
  */
-int odr_cstring(ODR o, char **p, int opt)
+int odr_cstring(ODR o, char **p, int opt, const char *name)
 {
     int cons = 0, res;
     Odr_oct *t;
@@ -93,10 +130,11 @@ int odr_cstring(ODR o, char **p, int opt)
     	return opt;
     if (o->direction == ODR_PRINT)
     {
-    	fprintf(o->print, "%s'%s'\n", odr_indent(o), *p);
+    	odr_prname(o, name);
+    	fprintf(o->print, "'%s'\n", *p);
     	return 1;
     }
-    t = odr_malloc(o, sizeof(Odr_oct));   /* wrapper for octstring */
+    t = (Odr_oct *)odr_malloc(o, sizeof(Odr_oct));   /* wrapper for octstring */
     if (o->direction == ODR_ENCODE)
     {
     	t->buf = (unsigned char *) *p;