Security-59306.61.1.tar.gz

[apple/security.git] / OSX / libsecurity_utilities / lib / cfmunge.cpp

diff --git a/OSX/libsecurity_utilities/lib/cfmunge.cpp b/OSX/libsecurity_utilities/lib/cfmunge.cpp
index 7c7bbf96ef90c78aabf47fb1374996f013834211..f26ccc72a6741ff09b29e9bca11502c779a3bf71 100644 (file)
--- a/OSX/libsecurity_utilities/lib/cfmunge.cpp
+++ b/OSX/libsecurity_utilities/lib/cfmunge.cpp
@@ -93,7 +93,7 @@ bool CFMunge::parameter()
 //
 // The top constructor.
 //
 //
 // The top constructor.
 //

-CFTypeRef CFMake::make()
+CFTypeRef CF_RETURNS_RETAINED CFMake::make()

 {
        while (next() == '@')
                parameter();
 {
        while (next() == '@')
                parameter();


@@ -126,7 +126,7 @@ CFTypeRef CFMake::make()
 }
 
 
 }
 
 

-CFTypeRef CFMake::makeformat()
+CFTypeRef CF_RETURNS_RETAINED CFMake::makeformat()

 {
        ++format;
        switch (*format++) {
 {
        ++format;
        switch (*format++) {


@@ -184,7 +184,7 @@ CFTypeRef CFMake::makenumber()
 // Embedded strings can either be alphanumeric (only), or delimited with single quotes ''.
 // No escapes are processed within such quotes. If you want arbitrary string values, use %s.
 //
 // Embedded strings can either be alphanumeric (only), or delimited with single quotes ''.
 // No escapes are processed within such quotes. If you want arbitrary string values, use %s.
 //

-CFTypeRef CFMake::makestring()
+CFTypeRef CF_RETURNS_RETAINED CFMake::makestring()

 {
        const char *start, *end;
        if (*format == '\'') {
 {
        const char *start, *end;
        if (*format == '\'') {


@@ -208,7 +208,7 @@ CFTypeRef CFMake::makestring()
 //
 // Construct a CFDictionary
 //
 //
 // Construct a CFDictionary
 //

-CFTypeRef CFMake::makedictionary()
+CFTypeRef CF_RETURNS_RETAINED CFMake::makedictionary()

 {
        ++format;       // next '{'
        next('!');      // indicates mutable (currently always true)
 {
        ++format;       // next '{'
        next('!');      // indicates mutable (currently always true)


@@ -272,7 +272,7 @@ CFDictionaryRef CFMake::addto(CFMutableDictionaryRef dict)
 //
 // Construct a CFArray
 //
 //
 // Construct a CFArray
 //

-CFTypeRef CFMake::makearray()
+CFTypeRef CF_RETURNS_RETAINED CFMake::makearray()

 {
        ++format;       // next '['
        next('!');      // indicates mutable (currently always)
 {
        ++format;       // next '['
        next('!');      // indicates mutable (currently always)


@@ -538,7 +538,7 @@ CFTypeRef CFScan::dictpath(CFTypeRef obj)
 //
 // The public functions
 //
 //
 // The public functions
 //

-CFTypeRef cfmake(const char *format, ...)
+CFTypeRef CF_RETURNS_RETAINED cfmake(const char *format, ...)

 {
        va_list args;
        va_start(args, format);
 {
        va_list args;
        va_start(args, format);


@@ -547,7 +547,7 @@ CFTypeRef cfmake(const char *format, ...)
        return result;
 }
 
        return result;
 }
 

-CFTypeRef vcfmake(const char *format, va_list *args)
+CFTypeRef CF_RETURNS_RETAINED vcfmake(const char *format, va_list *args)

 {
        return CFMake(format, args).make();
 }
 {
        return CFMake(format, args).make();
 }