X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp.c;h=1c1d9f0ca16bbe17753539dd7a2927c55280100f;hb=50910e85f05204a853e7e6975b1e3ef0adf1dbe6;hp=60cef68f58b99e09dc09b9dc9c810b235039004d;hpb=a94b5a44d632a6df1a1de5dc75e73adc03e8e6b4;p=yaz-moved-to-github.git

diff --git a/src/http.c b/src/http.c
index 60cef68..1c1d9f0 100644
--- a/src/http.c
+++ b/src/http.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2009 Index Data
  * See the file LICENSE for details.
- *
- * $Id: http.c,v 1.3 2007-09-06 17:11:59 mike Exp $
  */
 
 /**
@@ -14,6 +12,7 @@
 #include <yaz/odr.h>
 #include <yaz/yaz-version.h>
 #include <yaz/yaz-iconv.h>
+#include <yaz/matchstr.h>
 #include <yaz/zgdu.h>
 
 #ifdef WIN32
@@ -234,9 +233,9 @@ void z_HTTP_header_add_basic_auth(ODR o, Z_HTTP_Header **hp,
         return;
 
     len = strlen(username) + strlen(password);
-    tmp = odr_malloc(o, len+2);
+    tmp = (char *) odr_malloc(o, len+2);
     sprintf(tmp, "%s:%s", username, password);
-    buf = odr_malloc(o, (len+1) * 8/6 + 12);
+    buf = (char *) odr_malloc(o, (len+1) * 8/6 + 12);
     strcpy(buf, "Basic ");
     yaz_base64encode(tmp, &buf[strlen(buf)]);
     z_HTTP_header_add(o, hp, "Authorization", buf);
@@ -545,6 +544,7 @@ int yaz_encode_http_request(ODR o, Z_HTTP_Request *hr)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab