2005-04-24 Helge Hess <helge.hess@opengroupware.org>
+ * WOHttpAdaptor, WebDAV: fixed gcc 4.0 warnings (v4.5.154)
+
* v4.5.153
* Templates/WOHTMLParser.m: rewrote parser to use unichar
# version file
-SUBMINOR_VERSION:=153
+SUBMINOR_VERSION:=154
# v4.5.122 requires libNGExtensions v4.5.153
# v4.5.91 requires libNGExtensions v4.5.134
accept = [woRequest headerForKey:@"accept"];
if ([accept rangeOfString:@"text/html"].length > 0) {
- const unsigned char *txt = "could not perform request !<br />";
+ const char *txt = "could not perform request !<br />";
[mr setHeader:@"text/html" forKey:@"content-type"];
[mr setContent:[NSData dataWithBytes:txt length:strlen(txt)]];
}
}
- (const unsigned char *)_reasonForStatus:(unsigned int)_status {
- const unsigned char *reason;
+ const char *reason;
switch (_status) {
case 200: reason = "Ok"; break;
reason = "Request failed";
break;
}
- return reason;
+ return (const unsigned char *) reason;
}
- (void)_httpValidateResponse:(WOResponse *)_response {
if (isok) {
unsigned int slen, rlen;
const unsigned char *r;
- int s = [_response status];
+ int s;
+
+ s = [_response status];
t1 = [_response httpVersion];
r = [self _reasonForStatus:s];
slen = [t1 cStringLength];
- rlen = strlen(r);
+ rlen = strlen((const char *)r);
if ((slen + rlen + 8) < 1000) {
- [t1 getCString:buf];
- sprintf(&(buf[slen]), " %i %s\r\n", s, r);
- isok = [_out safeWriteBytes:buf count:strlen(buf)];
+ [t1 getCString:(char *)buf];
+ sprintf((char *)&(buf[slen]), " %i %s\r\n", s, r);
+ isok = [_out safeWriteBytes:buf count:strlen((char *)buf)];
}
else
isok = [out writeFormat:@"%@ %i %s\r\n", t, s, r];
/* add content length header */
- sprintf(buf, "%d", [body length]);
- t1 = [[NSString alloc] initWithCString:buf];
+ sprintf((char *)buf, "%d", [body length]);
+ t1 = [[NSString alloc] initWithCString:(char *)buf];
[_response setHeader:t1 forKey:@"content-length"];
[t1 release]; t1 = nil;
if (clen > 1000)
isok = [out writeString:t1];
else {
- [t1 getCString:buf];
+ [t1 getCString:(char *)buf];
[_out safeWriteBytes:buf count:clen];
}
}
[out release]; out = nil; // the buffer will be flushed ..
}
-static __inline__ const unsigned char *monthAbbr(int m) {
+static __inline__ const char *monthAbbr(int m) {
switch (m) {
case 1: return "Jan"; case 2: return "Feb"; case 3: return "Mar";
case 4: return "Apr"; case 5: return "May"; case 6: return "Jun";
return nil;
}
- return [NSString stringWithCString:m length:count];
+ return [NSString stringWithCString:(char *)m length:count];
}
- (NSString *)parseURI {
/* feed last char to next parsing step */
self->pushBack = c;
- s = [NSString stringWithCString:uri length:count];
+ s = [NSString stringWithCString:(char *)uri length:count];
if (uri) free(uri);
return s;
}
return @"HTTP/0.9";
}
- return [NSString stringWithCString:m length:count];
+ return [NSString stringWithCString:(char *)m length:count];
}
/* headers */
- (BOOL)parseSQL:(id *)result
from:(unichar **)pos length:(unsigned *)len
strict:(BOOL)beStrict;
-- (BOOL)parseToken:(const unsigned char *)tk
+- (BOOL)parseToken:(const char *)tk
from:(unichar **)pos length:(unsigned *)len
consume:(BOOL)consume;
- (BOOL)parseIdentifier:(NSString **)result
/* parsing parts (exported for overloading in subclasses) */
static inline BOOL
-uniIsCEq(unichar *haystack, const unsigned char *needle, unsigned len)
+uniIsCEq(unichar *haystack, const char *needle, unsigned len)
{
register unsigned idx;
for (idx = 0; idx < len; idx++) {
if (*needle == '\0') return YES;
- if (toupper(haystack[idx]) != needle[idx]) return NO;
+ if (toupper(haystack[idx]) != (unsigned char)needle[idx]) return NO;
}
return YES;
}
}
}
-- (BOOL)parseToken:(const unsigned char *)tk
+- (BOOL)parseToken:(const char *)tk
from:(unichar **)pos length:(unsigned *)len
consume:(BOOL)consume
{
- (id)performWebDAVBulkQuery:(EOFetchSpecification *)_fs inContext:(id)_ctx;
- (NSEnumerator *)davChildKeysInContext:(id)_ctx;
- (EODataSource *)contentDataSourceInContext:(id)_ctx;
-- (id)davQueryOnSelf:(EOFetchSpecification *)_fs inContext:(id)_ctx;
+- (NSArray *)davQueryOnSelf:(EOFetchSpecification *)_fs inContext:(id)_ctx;
- (NSArray *)defaultWebDAVPropertyNamesInContext:(id)_ctx;
#include "SoDAVLockManager.h"
#include "EOFetchSpecification+SoDAV.h"
#include "WOContext+SoObjects.h"
+#include <NGObjWeb/WOApplication.h>
#include <NGObjWeb/WORequest.h>
#include <NGObjWeb/WOResponse.h>
#include <NGObjWeb/WOContext.h>
}
if ([_object isKindOfClass:[NSData class]]) {
+ NSString *s;
+
[r setHeader:[self mimeTypeForData:_object inContext:_ctx]
forKey:@"content-type"];
- sprintf(buf, "%d", [_object length]);
- [r setHeader:[NSString stringWithCString:buf] forKey:@"content-length"];
+ sprintf((char *)buf, "%d", [_object length]);
+ s = [[NSString alloc] initWithCString:(const char *)buf];
+ if (s != nil) [r setHeader:s forKey:@"content-length"];
+ [s release];
if (!_onlyHead) [r setContent:_object];
return YES;
}
if ([_object isKindOfClass:[NSString class]]) {
- NSData *data;
+ NSData *data;
+ NSString *s;
[r setHeader:[self mimeTypeForString:_object inContext:_ctx]
forKey:@"content-type"];
data = [_object dataUsingEncoding:NSUTF8StringEncoding];
- sprintf(buf, "%d", [data length]);
- [r setHeader:[NSString stringWithCString:buf] forKey:@"content-length"];
+ sprintf((char *)buf, "%d", [data length]);
+ s = [[NSString alloc] initWithCString:(const char *)buf];
+ [r setHeader:s forKey:@"content-length"];
+ [s release];
[r setContent:data];
return YES;
}
if ([_object isKindOfClass:[NSDictionary class]]) {
NSArray *pending, *inactive;
- pending = [_object objectForKey:@"pending"];
- inactive = [_object objectForKey:@"inactive"];
+ pending = [(NSDictionary *)_object objectForKey:@"pending"];
+ inactive = [(NSDictionary *)_object objectForKey:@"inactive"];
[r setStatus:207 /* Multi-Status */];
[r setContentEncoding:NSUTF8StringEncoding];
projects / sope / commitdiff