projects
/
yaz-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
db073ed
)
Fix compilation without Libxml2 (broke in 4.2.0)
author
Adam Dickmeiss
<adam@indexdata.dk>
Fri, 27 May 2011 10:27:47 +0000
(12:27 +0200)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Fri, 27 May 2011 10:28:08 +0000
(12:28 +0200)
src/srwutil.c
patch
|
blob
|
history
diff --git
a/src/srwutil.c
b/src/srwutil.c
index
f6dfdc4
..
242ba16
100644
(file)
--- a/
src/srwutil.c
+++ b/
src/srwutil.c
@@
-79,7
+79,7
@@
const char *yaz_element_attribute_value_get(xmlNodePtr ptr, const char *node_nam
}
return 0;
}
}
return 0;
}
-
+#endif
static int yaz_base64decode(const char *in, char *out)
{
static int yaz_base64decode(const char *in, char *out)
{
@@
-126,7
+126,6
@@
static int yaz_base64decode(const char *in, char *out)
*out = '\0';
return olen;
}
*out = '\0';
return olen;
}
-#endif
int yaz_srw_check_content_type(Z_HTTP_Response *hres)
{
int yaz_srw_check_content_type(Z_HTTP_Response *hres)
{
@@
-146,7
+145,6
@@
int yaz_srw_check_content_type(Z_HTTP_Response *hres)
* Look for authentication tokens in HTTP Basic parameters or in x-username/x-password
* parameters. Added by SH.
*/
* Look for authentication tokens in HTTP Basic parameters or in x-username/x-password
* parameters. Added by SH.
*/
-#if YAZ_HAVE_XML2
static void yaz_srw_decodeauth(Z_SRW_PDU *sr, Z_HTTP_Request *hreq,
char *username, char *password, ODR decode)
{
static void yaz_srw_decodeauth(Z_SRW_PDU *sr, Z_HTTP_Request *hreq,
char *username, char *password, ODR decode)
{
@@
-181,7
+179,6
@@
static void yaz_srw_decodeauth(Z_SRW_PDU *sr, Z_HTTP_Request *hreq,
sr->password = odr_strdup(decode, pbuf);
}
}
sr->password = odr_strdup(decode, pbuf);
}
}
-#endif
void yaz_uri_val_int(const char *path, const char *name, ODR o, Odr_int **intp)
{
void yaz_uri_val_int(const char *path, const char *name, ODR o, Odr_int **intp)
{