gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-25 17:51:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make another couple of functions truly private

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@23922 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2006-10-20 12:57:59 +00:00
parent 9e7b96ab0e
commit 2a97010a5c
4 changed files with 33 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Source/GSFormat.m
View file

@ -761,11 +761,11 @@ parse_one_spec (const unichar *format, size_t posn, struct printf_spec *spec,
static inline void GSStrAppendUnichar(GSStr s, unichar u) static inline void GSStrAppendUnichar(GSStr s, unichar u)
{ {
GSStrAppendUnichars(s, &u, 1); GSPrivateStrAppendUnichars(s, &u, 1);
} }
#define outchar(Ch) GSStrAppendUnichar(s, Ch) #define outchar(Ch) GSStrAppendUnichar(s, Ch)
#define outstring(String, Len) GSStrAppendUnichars(s, String, Len) #define outstring(String, Len) GSPrivateStrAppendUnichars(s, String, Len)
/* For handling long_double and longlong we use the same flag. If /* For handling long_double and longlong we use the same flag. If
`long' and `long long' are effectively the same type define it to `long' and `long long' are effectively the same type define it to

41
Source/GSPrivate.h
View file

@ -172,16 +172,6 @@ typedef struct {
} GSStr_t; } GSStr_t;
typedef GSStr_t *GSStr; typedef GSStr_t *GSStr;
/*
* Function to append to GSStr
*/
extern void GSStrAppendUnichars(GSStr s, const unichar *u, unsigned l);
/*
* Make the content of this string into unicode if it is not in
* the external defaults C string encoding.
*/
void GSStrExternalize(GSStr s);
/* /*
* Enumeration for MacOS-X compatibility user defaults settings. * Enumeration for MacOS-X compatibility user defaults settings.
@ -242,6 +232,11 @@ GSPrivateAvailableEncodings() GS_ATTRIB_PRIVATE;
void void
GSPrivateBuildStrings(void) GS_ATTRIB_PRIVATE; GSPrivateBuildStrings(void) GS_ATTRIB_PRIVATE;
/* Used to check for termination of background tasks.
*/
BOOL
GSPrivateCheckTasks(void) GS_ATTRIB_PRIVATE;
/* get the default C-string encoding. /* get the default C-string encoding.
*/ */
NSStringEncoding NSStringEncoding
@ -285,16 +280,32 @@ GSPrivateIsByteEncoding(NSStringEncoding encoding) GS_ATTRIB_PRIVATE;
BOOL BOOL
GSPrivateIsEncodingSupported(NSStringEncoding encoding) GS_ATTRIB_PRIVATE; GSPrivateIsEncodingSupported(NSStringEncoding encoding) GS_ATTRIB_PRIVATE;
/* Function used by the NSRunLoop and friends for processing
/* * queued notifications which should be processed at the first safe moment.
* Functions used by the NSRunLoop and friends for processing
* queued notifications and task completion events.
*/ */
BOOL GSPrivateCheckTasks(void) GS_ATTRIB_PRIVATE;
void GSPrivateNotifyASAP(void) GS_ATTRIB_PRIVATE; void GSPrivateNotifyASAP(void) GS_ATTRIB_PRIVATE;
/* Function used by the NSRunLoop and friends for processing
* queued notifications which should be processed when the loop is idle.
*/
void GSPrivateNotifyIdle(void) GS_ATTRIB_PRIVATE; void GSPrivateNotifyIdle(void) GS_ATTRIB_PRIVATE;
/* Function used by the NSRunLoop and friends for determining whether
* there are more queued notifications to be processed.
*/
BOOL GSPrivateNotifyMore(void) GS_ATTRIB_PRIVATE; BOOL GSPrivateNotifyMore(void) GS_ATTRIB_PRIVATE;
/* Function to append data to an GSStr
*/
void
GSPrivateStrAppendUnichars(GSStr s, const unichar *u, unsigned l)
GS_ATTRIB_PRIVATE;
/* Make the content of this string into unicode if it is not in
* the external defaults C string encoding.
*/
void
GSPrivateStrExternalize(GSStr s) GS_ATTRIB_PRIVATE;
#endif /* _GSPrivate_h_ */ #endif /* _GSPrivate_h_ */

6
Source/GSString.m
View file

@ -5007,7 +5007,8 @@ NSAssert(_flags.free == 1 && _zone != 0, NSInternalInconsistencyException);
/** /**
* Append characters to a string. * Append characters to a string.
*/ */
void GSStrAppendUnichars(GSStr s, const unichar *u, unsigned l) void
GSPrivateStrAppendUnichars(GSStr s, const unichar *u, unsigned l)
{ {
/* /*
* Make the string wide if necessary. * Make the string wide if necessary.
@ -5080,7 +5081,8 @@ void GSStrAppendUnichars(GSStr s, const unichar *u, unsigned l)
} }
void GSStrExternalize(GSStr s) void
GSPrivateStrExternalize(GSStr s)
{ {
if (s->_flags.wide == 0 && internalEncoding != externalEncoding) if (s->_flags.wide == 0 && internalEncoding != externalEncoding)
{ {

2
Source/NSString.m
View file

@ -1087,7 +1087,7 @@ handle_printf_atsign (FILE *stream,
f._flags.wide = 0; f._flags.wide = 0;
f._flags.free = 0; f._flags.free = 0;
GSPrivateFormat(&f, fmt, argList, locale); GSPrivateFormat(&f, fmt, argList, locale);
GSStrExternalize(&f); GSPrivateStrExternalize(&f);
if (fmt != fbuf) if (fmt != fbuf)
{ {
objc_free(fmt); objc_free(fmt);