gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tidied function names

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@15180 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2002-11-29 14:21:09 +00:00
parent c2fa7da546
commit 3f2346e70d
4 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -2,6 +2,9 @@
* Tools/plparse.m: Stefan Urbaneks patch to return 1 on failure.
* Tools/sfparse.m: Similar code for this tool.
* Source/Additions/GSObjCRuntime.m: Tidied function names
* Headers/gnustep/base/GSObjCRuntime.h: ditto.
* Source/NSKeyValueCoding.m: Use new function names.
2002-11-28 Richard Frith-Macdonald <rfm@gnu.org>

7
Headers/gnustep/base/GSObjCRuntime.h
View file

@ -76,7 +76,7 @@
* Get the type encoding for a named ivar,
* and copy a value into an ivar.
*/
GS_EXPORT BOOL GSObjCFindInstanceVariable(id obj, const char *name,
GS_EXPORT BOOL GSObjCFindVariable(id obj, const char *name,
const char **type, unsigned int *size, int *offset);
GS_EXPORT void GSObjCGetVariable(id obj, int offset, unsigned int size,
void *data);
@ -104,8 +104,9 @@ GS_EXPORT void GSObjCSetValue(NSObject *self, NSString *key, id val, SEL sel,
*/
GS_EXPORT BOOL GSFindInstanceVariable(id obj, const char *name,
const char **type, unsigned int *size, int *offset);
GS_EXPORT void GSGetVariable(id obj, int offset, unsigned int size, void *data);
GS_EXPORT void GSSetVariable(id obj, int offset, unsigned int size,
GS_EXPORT void GSGetInstanceVariable(id obj, int offset, unsigned int size,
void *data);
GS_EXPORT void GSSetInstanceVariable(id obj, int offset, unsigned int size,
const void *data);
GS_EXPORT id GSGetValue(NSObject *self, NSString *key, SEL sel,
const char *type, unsigned size, int offset);

14
Source/Additions/GSObjCRuntime.m
View file

@ -38,12 +38,12 @@
#include <mframe.h>
#include <string.h>
/** Deprecated ... use GSObjCFindInstanceVariable() */
/** Deprecated ... use GSObjCFindVariable() */
BOOL
GSFindInstanceVariable(id obj, const char *name,
const char **type, unsigned int *size, int *offset)
{
return GSObjCFindInstanceVariable(obj, name, type, size, offset);
return GSObjCFindVariable(obj, name, type, size, offset);
}
/**
@ -54,7 +54,7 @@ GSFindInstanceVariable(id obj, const char *name,
* they are null pointers).
*/
BOOL
GSObjCFindInstanceVariable(id obj, const char *name,
GSObjCFindVariable(id obj, const char *name,
const char **type, unsigned int *size, int *offset)
{
Class class;
@ -96,14 +96,14 @@ GSObjCFindInstanceVariable(id obj, const char *name,
/** Deprecated ... use GSObjCGetVariable() */
void
GSGetVariable(id obj, int offset, unsigned int size, void *data)
GSGetInstanceVariable(id obj, int offset, unsigned int size, void *data)
{
GSObjCGetVariable(obj, offset, size, data);
}
/**
* Gets the value from an instance variable in obj<br />
* This function performs no checking ... you should use it only where
* you are providing information from a call to GSFindInstanceVariable()
* you are providing information from a call to GSFindVariable()
* and you know that the data area provided is the correct size.
*/
void
@ -114,14 +114,14 @@ GSObjCGetVariable(id obj, int offset, unsigned int size, void *data)
/** Deprecated ... use GSObjCSetVariable() */
void
GSSetVariable(id obj, int offset, unsigned int size, const void *data)
GSSetInstanceVariable(id obj, int offset, unsigned int size, const void *data)
{
GSObjCSetVariable(obj, offset, size, data);
}
/**
* Sets the value in an instance variable in obj<br />
* This function performs no checking ... you should use it only where
* you are providing information from a call to GSFindInstanceVariable()
* you are providing information from a call to GSObjCFindVariable()
* and you know that the data area provided is the correct size.
*/
void

20
Source/NSKeyValueCoding.m
View file

@ -123,11 +123,10 @@
if ([[self class] accessInstanceVariablesDirectly] == YES)
{
// _key
if (GSObjCFindInstanceVariable(self, name, &type, &size, &off)
== NO)
if (GSObjCFindVariable(self, name, &type, &size, &off) == NO)
{
name = &buf[4]; // key
GSObjCFindInstanceVariable(self, name, &type, &size, &off);
GSObjCFindVariable(self, name, &type, &size, &off);
}
}
if (type == NULL)
@ -198,11 +197,10 @@
buf[4] = lo;
buf[3] = '_';
name = &buf[3]; // _key
if (GSObjCFindInstanceVariable(self, name, &type, &size, &off)
== NO)
if (GSObjCFindVariable(self, name, &type, &size, &off) == NO)
{
name = &buf[4]; // key
GSObjCFindInstanceVariable(self, name, &type, &size, &off);
GSObjCFindVariable(self, name, &type, &size, &off);
}
}
if (type == NULL)
@ -266,12 +264,10 @@
buf[3] = '_';
buf[4] = lo;
name = &buf[3]; // _key
if (GSObjCFindInstanceVariable(self, name, &type, &size, &off)
== NO)
if (GSObjCFindVariable(self, name, &type, &size, &off) == NO)
{
name = &buf[4]; // key
GSObjCFindInstanceVariable(self, name, &type, &size,
&off);
GSObjCFindVariable(self, name, &type, &size, &off);
}
}
}
@ -380,10 +376,10 @@
buf[4] = lo;
buf[3] = '_';
name = &buf[3]; // _key
if (GSObjCFindInstanceVariable(self, name, &type, &size, &off) == NO)
if (GSObjCFindVariable(self, name, &type, &size, &off) == NO)
{
name = &buf[4]; // key
GSObjCFindInstanceVariable(self, name, &type, &size, &off);
GSObjCFindVariable(self, name, &type, &size, &off);
}
}
return GSObjCGetValue(self, aKey, sel, type, size, off);