1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
|
Description: Avoid compiler warnings for nd.c
Enable silent transition between string types 'xmlChar *'
and 'char *'. Libxml2 is not consistent.
.
Initialise strings with sane values.
Forwarded: yes
Author: Mats Erik Andersson <mats.andersson@gisladisker.se>
Last-Update: 2009-12-18
--- nd-0.8.2.orig/nd.c
+++ nd-0.8.2/nd.c
@@ -378,11 +378,11 @@
xmlBufferFree (temp_buf);
}
- if (headers) xmlBufferAdd (header_buf, headers, -1);
+ if (headers) xmlBufferAdd (header_buf, (xmlChar *) headers, -1);
ctxt = xmlNanoHTTPMethod (URL, method, input, contentType,
- xmlBufferLength (header_buf) == 0 ?
- NULL : xmlBufferContent (header_buf), ilen);
+ xmlBufferLength (header_buf) == 0 ? NULL
+ : (char *) xmlBufferContent (header_buf), ilen);
xmlBufferFree (header_buf);
if (ctxt == NULL) return(NULL);
@@ -399,18 +399,18 @@
if (returnCode == 407)
{
if (proxy_auth_header) xmlFree (proxy_auth_header);
- proxy_auth_header = xmlMemStrdup (xmlBufferContent (header_buf));
+ proxy_auth_header = xmlMemStrdup ((char *) xmlBufferContent (header_buf));
xmlBufferFree (header_buf);
header_buf = xmlBufferCreate ();
}
if (headers)
- xmlBufferAdd (header_buf, headers, -1);
+ xmlBufferAdd (header_buf, (xmlChar *) headers, -1);
if (proxy_auth_header)
- xmlBufferAdd (header_buf, proxy_auth_header, -1);
+ xmlBufferAdd (header_buf, (xmlChar *) proxy_auth_header, -1);
/* XXX If HTTP/1.1 and Keep-Alive, no need to close here. */
xmlNanoHTTPClose (ctxt);
ctxt = xmlNanoHTTPMethod(URL, method, input, contentType,
- xmlBufferContent (header_buf), ilen);
+ (char *) xmlBufferContent (header_buf), ilen);
xmlBufferFree (header_buf);
if (ctxt == NULL) return(NULL);
returnCode = xmlNanoHTTPReturnCode(ctxt);
@@ -486,7 +486,7 @@
<D:allprop/>\
</D:propfind>";
char depth_header [ND_HEADER_LINE_MAX];
- char *depth_str;
+ char *depth_str = "0";
switch (depth)
{
@@ -529,7 +529,7 @@
{
char depth_header [ND_HEADER_LINE_MAX];
char propfind_request [ND_REQUEST_MAX];
- char *depth_str;
+ char *depth_str = "0";
if (ns == NULL)
{
@@ -566,7 +566,8 @@
xmlNodePtr node;
char *name;
{
- if (node->ns && node->ns->href && (!strcmp (node->ns->href, "DAV:")))
+ if (node->ns && node->ns->href
+ && (!strcmp ((char *)node->ns->href, "DAV:")))
return !strcmp ((char *) node->name, name);
return 0;
}
@@ -710,14 +711,15 @@
node->restype = xmlMemStrdup ((char *) cur->children->name);
}
}
- else if (strcmp(cur->name,"text")) /* XXX is this true? */
+ else if (strcmp((char *) cur->name,"text")) /* XXX is this true? */
{
ndPropPtr prop;
prop = node->props;
node->props = ndPropNew();
node->props->name = xmlMemStrdup((char *) cur->name);
node->props->value = (char *) xmlNodeGetContent(cur);
- if (cur->ns && cur->ns->href && strcmp(cur->ns->href, "DAV:"))
+ if (cur->ns && cur->ns->href
+ && strcmp((char *) cur->ns->href, "DAV:"))
{
node->props->ns = xmlMemStrdup((char *) cur->ns->href);
}
@@ -942,7 +944,7 @@
if (buf == NULL)
return code;
// fprintf (stderr, "%s\n", xmlBufferContent(buf));
- doc = xmlParseMemory(xmlBufferContent(buf), xmlBufferLength(buf));
+ doc = xmlParseMemory((char *) xmlBufferContent(buf), xmlBufferLength(buf));
if (doc == NULL)
{
xmlBufferFree (buf);
@@ -1024,7 +1026,7 @@
{
if (buf == NULL)
return -1;
- doc = xmlParseMemory(xmlBufferContent(buf), xmlBufferLength(buf));
+ doc = xmlParseMemory((char *) xmlBufferContent(buf), xmlBufferLength(buf));
if (doc == NULL)
{
xmlBufferFree (buf);
@@ -1085,7 +1087,7 @@
xmlBufferAdd (buf, s, len);
}
- doc = xmlParseMemory(xmlBufferContent(buf), xmlBufferLength(buf));
+ doc = xmlParseMemory((char *) xmlBufferContent(buf), xmlBufferLength(buf));
if (doc == NULL)
{
xmlBufferFree (buf);
@@ -1247,7 +1249,7 @@
char lock_request[ND_REQUEST_MAX];
char scope_str[16];
char hstr [ND_HEADER_LINE_MAX];
- char *depth_str;
+ char *depth_str = "0";
if (!owner)
{
@@ -1321,7 +1323,7 @@
depth, owner, scope, timeout, &buf);
if (buf != NULL)
{
- doc = xmlParseMemory(xmlBufferContent(buf), xmlBufferLength(buf));
+ doc = xmlParseMemory((char *) xmlBufferContent(buf), xmlBufferLength(buf));
if (doc == NULL)
{
xmlBufferFree (buf);
@@ -1346,7 +1348,7 @@
void *ctxt;
char hstr [ND_HEADER_LINE_MAX];
int code;
- char *depth_str;
+ char *depth_str = "0";
switch (depth)
{
|
