gnustep/libs-gsweb
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gsweb.git synced 2025-05-31 09:11:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

o use GSWIntToNSString instead of string formatting

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@19956 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Manuel Guesdon 2004-09-01 14:49:27 +00:00
parent e11d0c51d8
commit bcd7d59217
5 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
GSWeb.framework/GSWRecording.m
View file

@ -205,9 +205,9 @@ RCS_ID("$Id$")
range:NSMakeRange(0,[contentString length])]; range:NSMakeRange(0,[contentString length])];
// Set new Content Length // Set new Content Length
[response setHeader:[NSString stringWithFormat:@"%d",[contentString length]] [response setHeader:GSWIntToNSString([contentString length])
forKey:@"GSWHTTPHeader_ContentLength"]; forKey:@"GSWHTTPHeader_ContentLength"];
[response setHeader:[NSString stringWithFormat:@"%d",contentLength] [response setHeader:GSWIntToNSString(contentLength)
forKey:@"x-gsweb-unwildcarded-content-length"]; forKey:@"x-gsweb-unwildcarded-content-length"];
[response setContentString:contentString]; [response setContentString:contentString];

4
GSWeb.framework/GSWRequest.m
View file

@ -466,7 +466,7 @@ RCS_ID("$Id$")
{ {
NSArray* adaptors = [[GSWApplication application]adaptors]; NSArray* adaptors = [[GSWApplication application]adaptors];
if ([adaptors count]>0) if ([adaptors count]>0)
serverPort = [NSString stringWithFormat:@"%d",[(GSWAdaptor*)[adaptors objectAtIndex:0] port]]; serverPort = GSWIntToNSString([(GSWAdaptor*)[adaptors objectAtIndex:0] port]);
} }
return serverPort; return serverPort;
} }
@ -2596,7 +2596,7 @@ into
applicationNumber=[gswinst intValue]; applicationNumber=[gswinst intValue];
}; };
if (applicationNumber>=0) if (applicationNumber>=0)
[dict setObject:[NSString stringWithFormat:@"%d",applicationNumber] [dict setObject:GSWIntToNSString(applicationNumber)
forKey:GSWKey_InstanceID[GSWebNamingConv]]; forKey:GSWKey_InstanceID[GSWebNamingConv]];
ASSIGN(_uriElements,[NSDictionary dictionaryWithDictionary:dict]); ASSIGN(_uriElements,[NSDictionary dictionaryWithDictionary:dict]);

11
GSWeb.framework/GSWResponse.m
View file

@ -257,8 +257,6 @@ static NSArray* cacheControlHeaderValues=nil;
//-------------------------------------------------------------------- //--------------------------------------------------------------------
-(void)_finalizeInContext:(GSWContext*)aContext -(void)_finalizeInContext:(GSWContext*)aContext
{ {
GSWRequest* request=nil;
int applicationNumber=-1;
int dataLength=0; int dataLength=0;
NSString* dataLengthString=nil; NSString* dataLengthString=nil;
NSData* content=nil; NSData* content=nil;
@ -287,13 +285,13 @@ static NSArray* cacheControlHeaderValues=nil;
// Add load info to headers // Add load info to headers
if (![self headersForKey:GSWHTTPHeader_LoadAverage[GSWebNamingConv]]) if (![self headersForKey:GSWHTTPHeader_LoadAverage[GSWebNamingConv]])
[self setHeader:[NSString stringWithFormat:@"%d",[GSWApp activeSessionsCount]] [self setHeader:GSWIntToNSString([GSWApp activeSessionsCount])
forKey:GSWHTTPHeader_LoadAverage[GSWebNamingConv]]; forKey:GSWHTTPHeader_LoadAverage[GSWebNamingConv]];
// Add refusing new sessions info to headers // Add refusing new sessions info to headers
if ([GSWApp isRefusingNewSessions] if ([GSWApp isRefusingNewSessions]
&& ![self headersForKey:GSWHTTPHeader_RefuseSessions[GSWebNamingConv]]) && ![self headersForKey:GSWHTTPHeader_RefuseSessions[GSWebNamingConv]])
[self setHeader:[NSString stringWithFormat:@"%d",(int)[GSWApp _refuseNewSessionsTimeInterval]] [self setHeader:GSWIntToNSString((int)[GSWApp _refuseNewSessionsTimeInterval])
forKey:GSWHTTPHeader_RefuseSessions[GSWebNamingConv]]; forKey:GSWHTTPHeader_RefuseSessions[GSWebNamingConv]];
[self _finalizeContentEncodingInContext:aContext]; [self _finalizeContentEncodingInContext:aContext];
@ -302,8 +300,7 @@ static NSArray* cacheControlHeaderValues=nil;
dataLength=[self _contentLength]; dataLength=[self _contentLength];
NSDebugMLog(@"dataLength=%d",dataLength); NSDebugMLog(@"dataLength=%d",dataLength);
dataLengthString=[NSString stringWithFormat:@"%d", dataLengthString=GSWIntToNSString(dataLength);
dataLength];
[self setHeader:dataLengthString [self setHeader:dataLengthString
forKey:GSWHTTPHeader_ContentLength]; forKey:GSWHTTPHeader_ContentLength];
@ -516,7 +513,7 @@ escapingHTMLAttributeValue:(BOOL)escape
{ {
[self appendContentString:message]; [self appendContentString:message];
[self setHeader:[NSString stringWithFormat:@"%d",[[self content] length]] [self setHeader:GSWIntToNSString([[self content] length])
forKey:@"content-length"]; forKey:@"content-length"];
}; };
if (isDefinitive) if (isDefinitive)

2
GSWeb.framework/GSWSession.m
View file

@ -931,7 +931,7 @@ RCS_ID("$Id$")
instance=-1; instance=-1;
}; };
[aResponse addCookie:[GSWCookie cookieWithName:GSWKey_InstanceID[GSWebNamingConv] [aResponse addCookie:[GSWCookie cookieWithName:GSWKey_InstanceID[GSWebNamingConv]
value:[NSString stringWithFormat:@"%d",instance] value:GSWIntToNSString(instance)
path:domainForIDCookies path:domainForIDCookies
domain:nil domain:nil
expires:anExpireDate expires:anExpireDate

14
GSWeb.framework/GSWStatisticsStore.m
View file

@ -1,6 +1,6 @@
/** GSWStatisticsStore.m - <title>GSWeb: Class GSWStatisticsStore</title> /** GSWStatisticsStore.m - <title>GSWeb: Class GSWStatisticsStore</title>
Copyright (C) 1999-2003 Free Software Foundation, Inc. Copyright (C) 1999-2004 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com> Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999 Date: Jan 1999
@ -164,7 +164,7 @@ RCS_ID("$Id$")
// Sessions // Sessions
[sessionsDict setObject:[NSString stringWithFormat:@"%d",_sessionsCount] [sessionsDict setObject:GSWIntToNSString(_sessionsCount)
forKey:@"Current Active Sessions"]; forKey:@"Current Active Sessions"];
@ -267,11 +267,11 @@ RCS_ID("$Id$")
//-------------------------------------------------------------------- //--------------------------------------------------------------------
-(void)_sessionTerminating:(GSWSession*)aSession -(void)_sessionTerminating:(GSWSession*)aSession
{ {
int activeSessionsCount; int activeSessionsCount = 0;
NSArray* statistics; NSArray* statistics = nil;
NSDate* sessionBirthDate; NSDate* sessionBirthDate = nil;
NSTimeInterval sessionTimeOut; NSTimeInterval sessionTimeOut = nil;
int sessionRequestCounter; int sessionRequestCounter = 0;
//OK //OK
LOGObjectFnStart(); LOGObjectFnStart();
activeSessionsCount=[GSWApp _activeSessionsCount]; activeSessionsCount=[GSWApp _activeSessionsCount];