X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fzgdu.c;h=8c8222e6b9587b59b79343821a04fcab1868721f;hp=f79bc9b7c4721a5e5d069eddce10f7e798521ed9;hb=2b8637b1b34cbbd57cee3cd1b493f5a8231e9afd;hpb=f9d5791b3b7222309b5112e8e269ff36325d7498

diff --git a/src/zgdu.c b/src/zgdu.c
index f79bc9b..8c8222e 100644
--- a/src/zgdu.c
+++ b/src/zgdu.c
@@ -1,34 +1,35 @@
-/*
- * 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: zgdu.c,v 1.19 2007-01-11 10:55:57 adam Exp $
  */
-
 /**
  * \file zgdu.c
  * \brief Implements HTTP and Z39.50 encoding and decoding.
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <string.h>
-#include <yaz/odr.h>
+#include "odr-priv.h"
 #include <yaz/zgdu.h>
 
-int z_GDU (ODR o, Z_GDU **p, int opt, const char *name)
+int z_GDU(ODR o, Z_GDU **p, int opt, const char *name)
 {
+    const char *buf = o->op->buf;
     if (o->direction == ODR_DECODE) {
         *p = (Z_GDU *) odr_malloc(o, sizeof(**p));
-        if (o->size > 10 && !memcmp(o->buf, "HTTP/", 5))
+        if (o->op->size > 10 && !memcmp(buf, "HTTP/", 5))
         {
             (*p)->which = Z_GDU_HTTP_Response;
             return yaz_decode_http_response(o, &(*p)->u.HTTP_Response);
 
         }
-        else if (o->size > 5 &&
-            o->buf[0] >= 0x20 && o->buf[0] < 0x7f
-            && o->buf[1] >= 0x20 && o->buf[1] < 0x7f
-            && o->buf[2] >= 0x20 && o->buf[2] < 0x7f
-            && o->buf[3] >= 0x20 && o->buf[3] < 0x7f)
+        else if (o->op->size > 5 &&
+            buf[0] >= 0x20 && buf[0] < 0x7f
+            && buf[1] >= 0x20 && buf[1] < 0x7f
+            && buf[2] >= 0x20 && buf[2] < 0x7f
+            && buf[3] >= 0x20 && buf[3] < 0x7f)
         {
             (*p)->which = Z_GDU_HTTP_Request;
             return yaz_decode_http_request(o, &(*p)->u.HTTP_Request);
@@ -57,6 +58,7 @@ int z_GDU (ODR o, Z_GDU **p, int opt, const char *name)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab