mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-23 17:10:48 +00:00
Use release' and
dealloc' instead of `free'.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@103 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
6fbf69b711
commit
9dadd15c78
13 changed files with 53 additions and 47 deletions
|
@ -49,7 +49,7 @@ enum DelegatePoolSendBehavior {SEND_TO_ALL = 0,
|
|||
+ alloc;
|
||||
+ new;
|
||||
- init;
|
||||
- free;
|
||||
- (void) dealloc;
|
||||
|
||||
// MANIPULATING COLLECTION OF DELEGATES;
|
||||
- delegatePoolAddObject: anObject;
|
||||
|
|
|
@ -25,6 +25,9 @@
|
|||
This object is just temporary. Eventually, we should separate
|
||||
reference counting functionality from notification functionality */
|
||||
|
||||
/* xxx March 1995: Now that we have a root object that handles retaining,
|
||||
we should create a plain Notifier class. */
|
||||
|
||||
#ifndef __RetainingNotifier_h
|
||||
#define __RetainingNotifier_h
|
||||
|
||||
|
@ -42,9 +45,7 @@
|
|||
int retain_count;
|
||||
}
|
||||
|
||||
+ initialize;
|
||||
- init;
|
||||
- free;
|
||||
- (unsigned) retainCount;
|
||||
- registerForInvalidationNotification: (id <InvalidationListening>)anObject;
|
||||
- unregisterForInvalidationNotification: (id <InvalidationListening>)anObject;
|
||||
|
|
|
@ -158,7 +158,8 @@ static BOOL debug_connected_coder = NO;
|
|||
(unsigned)self, sequence_number, identifier,
|
||||
buffer_len, sent_len, b);
|
||||
}
|
||||
return [self free];
|
||||
[self release];
|
||||
return nil;
|
||||
}
|
||||
|
||||
static elt
|
||||
|
@ -259,10 +260,10 @@ exc_return_null(arglist_t f)
|
|||
|
||||
#endif /* CONNECTION_WIDE_REFERENCES */
|
||||
|
||||
- free
|
||||
- (void) dealloc
|
||||
{
|
||||
/* Anything else? */
|
||||
return [super free];
|
||||
[super dealloc];
|
||||
}
|
||||
|
||||
- (int) identifier
|
||||
|
|
|
@ -417,7 +417,7 @@ static int messagesReceivedCount;
|
|||
id newPort = [default_port_class newPort];
|
||||
id newConn =
|
||||
[Connection newForInPort:newPort outPort:nil ancestorConnection:nil];
|
||||
[self free];
|
||||
[self release];
|
||||
return newConn;
|
||||
}
|
||||
|
||||
|
@ -590,10 +590,10 @@ static int messagesReceivedCount;
|
|||
}
|
||||
[proxiesHashGate lock];
|
||||
[remote_proxies withElementsCall:deallocObj];
|
||||
[remote_proxies free];
|
||||
[local_targets free];
|
||||
[incoming_const_ptrs free];
|
||||
[outgoing_const_ptrs free];
|
||||
[remote_proxies release];
|
||||
[local_targets release];
|
||||
[incoming_const_ptrs release];
|
||||
[outgoing_const_ptrs release];
|
||||
[proxiesHashGate unlock];
|
||||
}
|
||||
[super dealloc];
|
||||
|
|
|
@ -241,10 +241,10 @@ void unchar_func(void *s, int c)
|
|||
return position;
|
||||
}
|
||||
|
||||
- free
|
||||
- (void) dealloc
|
||||
{
|
||||
OBJC_FREE(buffer);
|
||||
return [super free];
|
||||
[super dealloc];
|
||||
}
|
||||
|
||||
- (BOOL) streamEof
|
||||
|
|
|
@ -1,3 +1,25 @@
|
|||
/* Implementation of NSMethodSignature for GNUStep
|
||||
Copyright (C) 1994, 1995 Free Software Foundation, Inc.
|
||||
|
||||
Written by: R. Andrew McCallum <mccallum@gnu.ai.mit.edu>
|
||||
Date: August 1994
|
||||
|
||||
This file is part of the GNU Objective C Class Library.
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Library General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2 of the License, or (at your option) any later version.
|
||||
|
||||
This library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Library General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Library General Public
|
||||
License along with this library; if not, write to the Free
|
||||
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#include "foundation/NSMethodSignature.h"
|
||||
#include "objc/objc-malloc.h"
|
||||
|
@ -71,10 +93,10 @@ types_get_number_of_arguments (const char *types)
|
|||
return numArgs;
|
||||
}
|
||||
|
||||
- free
|
||||
- (void) dealloc
|
||||
{
|
||||
OBJC_FREE(types);
|
||||
return [super free];
|
||||
[super dealloc];
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
|
@ -50,7 +50,7 @@ static Class NXConnectionProxyClass;
|
|||
[aList addObject:c];
|
||||
}
|
||||
[cs withObjectsCall:add_to_aList];
|
||||
[cs free];
|
||||
[cs release];
|
||||
return self;
|
||||
}
|
||||
|
||||
|
@ -176,7 +176,7 @@ static Class NXConnectionProxyClass;
|
|||
[aList addObject:c];
|
||||
}
|
||||
[cs withObjectsCall:add_to_aList];
|
||||
[cs free];
|
||||
[cs release];
|
||||
return aList;
|
||||
}
|
||||
|
||||
|
@ -189,7 +189,7 @@ static Class NXConnectionProxyClass;
|
|||
[aList addObject:c];
|
||||
}
|
||||
[cs withObjectsCall:add_to_aList];
|
||||
[cs free];
|
||||
[cs release];
|
||||
return aList;
|
||||
}
|
||||
|
||||
|
|
|
@ -296,12 +296,6 @@ static inline BOOL class_is_kind_of(Class self, Class aClassObject)
|
|||
|
||||
/* xxx Clean up all this junk below */
|
||||
|
||||
- free
|
||||
{
|
||||
[self release];
|
||||
return self;
|
||||
}
|
||||
|
||||
- (oneway void) release
|
||||
{
|
||||
if (!retain_count--)
|
||||
|
|
|
@ -56,10 +56,10 @@
|
|||
return self;
|
||||
}
|
||||
|
||||
- free
|
||||
- (void) dealloc
|
||||
{
|
||||
OBJC_FREE(table);
|
||||
return [super free];
|
||||
[super dealloc];
|
||||
}
|
||||
|
||||
- init
|
||||
|
|
19
Source/Set.m
19
Source/Set.m
|
@ -29,11 +29,10 @@
|
|||
|
||||
@implementation Set
|
||||
|
||||
+ initialize
|
||||
+ (void) initialize
|
||||
{
|
||||
if (self == [Set class])
|
||||
[self setVersion:0]; /* beta release */
|
||||
return self;
|
||||
}
|
||||
|
||||
// MANAGING CAPACITY;
|
||||
|
@ -145,22 +144,10 @@
|
|||
return [self initWithType:@encode(id) capacity:aCapacity];
|
||||
}
|
||||
|
||||
- free
|
||||
- (void) dealloc
|
||||
{
|
||||
coll_hash_delete(_contents_hash);
|
||||
return [super free];
|
||||
}
|
||||
|
||||
- freeObjects
|
||||
{
|
||||
if (CONTAINS_OBJECTS)
|
||||
{
|
||||
[self makeObjectsPerform:@selector(free)];
|
||||
[self empty];
|
||||
}
|
||||
else
|
||||
[self empty];
|
||||
return self;
|
||||
[super dealloc];
|
||||
}
|
||||
|
||||
// SET OPERATIONS;
|
||||
|
|
|
@ -200,10 +200,10 @@ stdio_unchar_func(void *s, int c)
|
|||
return NO;
|
||||
}
|
||||
|
||||
- free
|
||||
- (void) dealloc
|
||||
{
|
||||
fclose(fp);
|
||||
return [super free];
|
||||
[super dealloc];
|
||||
}
|
||||
|
||||
- (void) encodeWithCoder: (Coder*)anEncoder
|
||||
|
|
|
@ -49,7 +49,7 @@ enum DelegatePoolSendBehavior {SEND_TO_ALL = 0,
|
|||
+ alloc;
|
||||
+ new;
|
||||
- init;
|
||||
- free;
|
||||
- (void) dealloc;
|
||||
|
||||
// MANIPULATING COLLECTION OF DELEGATES;
|
||||
- delegatePoolAddObject: anObject;
|
||||
|
|
|
@ -25,6 +25,9 @@
|
|||
This object is just temporary. Eventually, we should separate
|
||||
reference counting functionality from notification functionality */
|
||||
|
||||
/* xxx March 1995: Now that we have a root object that handles retaining,
|
||||
we should create a plain Notifier class. */
|
||||
|
||||
#ifndef __RetainingNotifier_h
|
||||
#define __RetainingNotifier_h
|
||||
|
||||
|
@ -42,9 +45,7 @@
|
|||
int retain_count;
|
||||
}
|
||||
|
||||
+ initialize;
|
||||
- init;
|
||||
- free;
|
||||
- (unsigned) retainCount;
|
||||
- registerForInvalidationNotification: (id <InvalidationListening>)anObject;
|
||||
- unregisterForInvalidationNotification: (id <InvalidationListening>)anObject;
|
||||
|
|
Loading…
Reference in a new issue