Security-59754.60.13.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..2854e600dc4222cb9a90c48ee87631aaa7c77352 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.
 //
-CFTypeRef CFMake::make()
+CFTypeRef CF_RETURNS_RETAINED CFMake::make()
 {
        while (next() == '@')
                parameter();
@@ -126,7 +126,7 @@ CFTypeRef CFMake::make()
 }
 
 
-CFTypeRef CFMake::makeformat()
+CFTypeRef CF_RETURNS_RETAINED CFMake::makeformat()
 {
        ++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.
 //
-CFTypeRef CFMake::makestring()
+CFTypeRef CF_RETURNS_RETAINED CFMake::makestring()
 {
        const char *start, *end;
        if (*format == '\'') {
@@ -208,7 +208,7 @@ CFTypeRef CFMake::makestring()
 //
 // Construct a CFDictionary
 //
-CFTypeRef CFMake::makedictionary()
+CFTypeRef CF_RETURNS_RETAINED CFMake::makedictionary()
 {
        ++format;       // next '{'
        next('!');      // indicates mutable (currently always true)
@@ -221,17 +221,21 @@ CFTypeRef CFMake::makedictionary()
                                return dict;
                } else
                        return NULL;    // bad syntax
-       } else
+    } else {
                dict = CFDictionaryCreateMutable(allocator, 0,
                        &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
-    if (dict == NULL)
+    }
+
+    if (dict == NULL) {
         return dict;
-       if (add(dict))
-               return dict;
-       else {
-               CFReleaseSafe(dict);
-               return NULL;
-       }
+    }
+
+    if (add(dict)) {
+        return dict;
+    } else {
+        CFReleaseSafe(dict);
+        return NULL;
+    }
 }
 
 CFDictionaryRef CFMake::add(CFMutableDictionaryRef dict)
@@ -272,7 +276,7 @@ CFDictionaryRef CFMake::addto(CFMutableDictionaryRef dict)
 //
 // Construct a CFArray
 //
-CFTypeRef CFMake::makearray()
+CFTypeRef CF_RETURNS_RETAINED CFMake::makearray()
 {
        ++format;       // next '['
        next('!');      // indicates mutable (currently always)
@@ -538,7 +542,7 @@ CFTypeRef CFScan::dictpath(CFTypeRef obj)
 //
 // The public functions
 //
-CFTypeRef cfmake(const char *format, ...)
+CFTypeRef CF_RETURNS_RETAINED cfmake(const char *format, ...)
 {
        va_list args;
        va_start(args, format);
@@ -547,7 +551,7 @@ CFTypeRef cfmake(const char *format, ...)
        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();
 }