gnustep/libs-gsweb
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gsweb.git synced 2025-04-23 15:33:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* GSWeb/GSWMessage.[h|]

Browse source 
get rid of bogus #ifndef NO_GNUSTEP

Also tested by Graham Lee on Mac, thanks



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@36682 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Sebastian Reitenbach 2013-05-31 08:22:17 +00:00
parent 220246339d
commit e0ca8e7c7e
3 changed files with 4 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-05-31: Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
* GSWeb/GSWMessage.[h|]
get rid of bogus #ifndef NO_GNUSTEP
2013-05-30: Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
* GSWeb/GSWElement.h
@class not needed after including full header of that class

7
GSWeb/GSWMessage.h
View file

@ -92,11 +92,9 @@ GSWEB_EXPORT NSString* GSWMessage_stringByConvertingToHTML(GSWMessage* aMessage,
NSMutableData* _contentData;
IMP _contentDataADImp;
#ifndef NO_GNUSTEP
NSMutableArray* _cachesStack; // Cache Stacks
NSMutableData* _currentCacheData; // Current Cache Data (last object of _cachesStack). Do not retain/release
IMP _currentCacheDataADImp;
#endif
@public // For functions
GSWMessageIMPs _selfMsgIMPs;
@ -188,14 +186,9 @@ GSWEB_EXPORT NSString* GSWMessage_stringByConvertingToHTML(GSWMessage* aMessage,
@end
//====================================================================
#ifndef NO_GNUSTEP
@interface GSWMessage (GSWMessageCache)
-(int)startCache;
-(id)stopCacheOfIndex:(int)cacheIndex;
@end
#endif
#endif //_GSWMessage_h__

21
GSWeb/GSWMessage.m
View file

@ -261,16 +261,12 @@ static id GSWMessageDataCache[GSWMESSGAEDATACHESIZE];
#define DEF_CONTENT_SIZE 81920
//====================================================================
#ifndef NO_GNUSTEP
@interface GSWMessage (GSWMessageCachePrivate)
-(void)_cacheAppendData:(NSData*)data;
-(void)_cacheAppendBytes:(const void*)aBuffer
length:(unsigned int)bufferSize;
@end
#endif
//====================================================================
#define assertContentDataADImp(); \
{ if (!_contentDataADImp) { \
@ -485,9 +481,7 @@ static __inline__ NSMutableData *_checkBody(GSWMessage *self) {
//NSDebugFLog0(@"Release Message cookies");
DESTROY(_cookies);
// NSDebugFLog0(@"Release Message");
#ifndef NO_GNUSTEP
DESTROY(_cachesStack);
#endif
[super dealloc];
};
@ -514,7 +508,6 @@ static __inline__ NSMutableData *_checkBody(GSWMessage *self) {
clone->_contentData=[_contentData mutableCopyWithZone:zone];
clone->_contentDataADImp=NULL;
#ifndef NO_GNUSTEP
DESTROY(clone->_cachesStack);
clone->_cachesStack=[_cachesStack mutableCopyWithZone:zone];
if ([clone->_cachesStack count]>0)
@ -522,7 +515,6 @@ static __inline__ NSMutableData *_checkBody(GSWMessage *self) {
clone->_currentCacheData=[clone->_cachesStack lastObject];
clone->_currentCacheDataADImp=NULL;
};
#endif
};
return clone;
};
@ -807,14 +799,12 @@ static __inline__ NSMutableData *_checkBody(GSWMessage *self) {
_checkBody(self);
(*_contentDataADImp)(_contentData,appendDataSel,contentData);
#ifndef NO_GNUSTEP
// Caching management
if (_currentCacheData)
{
assertCurrentCacheDataADImp();
(*_currentCacheDataADImp)(_currentCacheData,appendDataSel,contentData);
};
#endif
};
}
@ -841,7 +831,6 @@ static __inline__ NSMutableData *_checkBody(GSWMessage *self) {
_checkBody(self);
(*_contentDataADImp)(_contentData,appendDataSel,myData);
#ifndef NO_GNUSTEP
#warning check this. -- dw
// Caching management
if (_currentCacheData)
@ -849,7 +838,6 @@ static __inline__ NSMutableData *_checkBody(GSWMessage *self) {
assertCurrentCacheDataADImp();
(*_currentCacheDataADImp)(_currentCacheData,appendDataSel,myData);
};
#endif
};
}
@ -864,14 +852,12 @@ static __inline__ NSMutableData *_checkBody(GSWMessage *self) {
(*_contentDataADImp)(_contentData,appendDataSel,ad);
#ifndef NO_GNUSTEP
// Caching management
if (_currentCacheData)
{
assertCurrentCacheDataADImp();
(*_currentCacheDataADImp)(_currentCacheData,appendDataSel,ad);
};
#endif
};
}
@ -908,14 +894,12 @@ NSLog(@"%s - '%s' '%@'",__PRETTY_FUNCTION__, string, nsstring);
_checkBody(self);
(*_contentDataADImp)(_contentData,appendDataSel,myData);
#ifndef NO_GNUSTEP
// Caching management
if (_currentCacheData)
{
assertCurrentCacheDataADImp();
(*_currentCacheDataADImp)(_currentCacheData,appendDataSel,myData);
}
#endif
}
}
@ -958,14 +942,12 @@ NSLog(@"%s - '%s' '%@'",__PRETTY_FUNCTION__, string, nsstring);
[_contentData appendBytes:bytes
length:length];
#ifndef NO_GNUSTEP
// Caching management
if (_currentCacheData)
{
[_currentCacheData appendBytes:bytes
length:length];
};
#endif
};
};
@ -1217,8 +1199,6 @@ NSLog(@"%s - '%s' '%@'",__PRETTY_FUNCTION__, string, nsstring);
//====================================================================
#ifndef NO_GNUSTEP
@implementation GSWMessage (GSWMessageCache)
//--------------------------------------------------------------------
@ -1296,4 +1276,3 @@ NSLog(@"%s - '%s' '%@'",__PRETTY_FUNCTION__, string, nsstring);
@end
#endif