Return extended krb5 error strings

Use krb5_get_error_message instead of error_message for
detailed krb5 error strings.  Also removed a few remaining
instances of types ending in _t and fixed up some
whitespace issues.

Recommend ignoring whitespace diff.

ticket: new

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20579 dc483132-0cff-0310-8789-dd5450dbe970

4 files changed, 90 insertions, 90 deletions

diff --git a/src/kim/lib/mac/kim_os_preferences.c b/src/kim/lib/mac/kim_os_preferences.c
index 9bc5c8575..9b3f44d4a 100644
--- a/src/kim/lib/mac/kim_os_preferences.c
+++ b/src/kim/lib/mac/kim_os_preferences.c
@@ -35,15 +35,15 @@
 
 /* ------------------------------------------------------------------------ */
 
-static kim_error kim_os_preferences_cfstring_for_key (kim_preference_key_t in_key,
-                                                        CFStringRef          *out_kim_string_key,
-                                                        CFStringRef          *out_kll_string_key)
+static kim_error kim_os_preferences_cfstring_for_key (kim_preference_key in_key,
+                                                      CFStringRef          *out_kim_string_key,
+                                                      CFStringRef          *out_kll_string_key)
 {
     kim_error err = KIM_NO_ERROR;
-
+    
     if (!err && !out_kim_string_key) { err = param_error (2, "out_kim_string_key", "NULL"); }
     if (!err && !out_kll_string_key) { err = param_error (3, "out_kll_string_key", "NULL"); }
-
+    
     if (!err) {
         if (in_key == kim_preference_key_lifetime) {
             *out_kim_string_key = CFSTR ("CredentialLifetime");
@@ -111,9 +111,9 @@ static kim_error kim_os_preferences_cfstring_for_key (kim_preference_key_t in_ke
 
 /* ------------------------------------------------------------------------ */
 
-static kim_error kim_os_preferences_get_value (kim_preference_key_t  in_key, 
-                                                 CFTypeID              in_type, 
-                                                 CFPropertyListRef    *out_value)
+static kim_error kim_os_preferences_get_value (kim_preference_key  in_key, 
+                                               CFTypeID              in_type, 
+                                               CFPropertyListRef    *out_value)
 {
     
     kim_error err = KIM_NO_ERROR;
@@ -132,7 +132,7 @@ static kim_error kim_os_preferences_get_value (kim_preference_key_t  in_key,
     
     if (!err) {
         kim_count u, f, h;
-
+        
         if (!kim_library_allow_home_directory_access()) {
             users[0] = kCFPreferencesAnyUser;
             users[1] = NULL;
@@ -158,19 +158,19 @@ static kim_error kim_os_preferences_get_value (kim_preference_key_t  in_key,
     }
     
     if (value) { CFRelease (value); }
-
+    
     return check_error (err);
 }
 
 /* ------------------------------------------------------------------------ */
 
-static kim_error kim_os_preferences_set_value (kim_preference_key_t in_key, 
-                                                 CFPropertyListRef    in_value)
+static kim_error kim_os_preferences_set_value (kim_preference_key in_key, 
+                                               CFPropertyListRef    in_value)
 {
     kim_error err = KIM_NO_ERROR;
     CFStringRef kim_key = NULL;
     CFStringRef kll_key = NULL;
-   
+    
     if (!err && !in_value) { err = param_error (2, "in_value", "NULL"); }
     
     if (!err) {
@@ -181,13 +181,13 @@ static kim_error kim_os_preferences_set_value (kim_preference_key_t in_key,
         kim_boolean homedir_ok = kim_library_allow_home_directory_access();
         CFStringRef user = homedir_ok ? kCFPreferencesCurrentUser : kCFPreferencesAnyUser;
         CFStringRef host = homedir_ok ? kCFPreferencesAnyHost : kCFPreferencesCurrentHost;
-
+        
         CFPreferencesSetValue (kim_key, in_value, KIM_PREFERENCES_FILE, user, host);
         if (!CFPreferencesSynchronize (KIM_PREFERENCES_FILE, user, host)) {
             err = kim_error_create_from_code (KIM_PREFERENCES_WRITE_ECODE);
         }
     }
-
+    
     return check_error (err);
 }
 
@@ -195,9 +195,9 @@ static kim_error kim_os_preferences_set_value (kim_preference_key_t in_key,
 
 /* ------------------------------------------------------------------------ */
 
-kim_error kim_os_preferences_get_identity_for_key (kim_preference_key_t  in_key, 
-                                                     kim_identity        in_hardcoded_default,
-                                                     kim_identity       *out_identity)
+kim_error kim_os_preferences_get_identity_for_key (kim_preference_key  in_key, 
+                                                   kim_identity        in_hardcoded_default,
+                                                   kim_identity       *out_identity)
 {
     kim_error err = KIM_NO_ERROR;
     kim_string string = NULL;
@@ -235,8 +235,8 @@ kim_error kim_os_preferences_get_identity_for_key (kim_preference_key_t  in_key,
 
 /* ------------------------------------------------------------------------ */
 
-kim_error kim_os_preferences_set_identity_for_key (kim_preference_key_t in_key, 
-                                                     kim_identity       in_identity)
+kim_error kim_os_preferences_set_identity_for_key (kim_preference_key in_key, 
+                                                   kim_identity       in_identity)
 {
     kim_error err = KIM_NO_ERROR;
     CFStringRef value = NULL;
@@ -260,7 +260,7 @@ kim_error kim_os_preferences_set_identity_for_key (kim_preference_key_t in_key,
     if (!err) {
         err = kim_os_preferences_set_value (in_key, value);
     }
-
+    
     if (value) { CFRelease (value); }
     kim_string_free (&string);
     
@@ -269,9 +269,9 @@ kim_error kim_os_preferences_set_identity_for_key (kim_preference_key_t in_key,
 
 /* ------------------------------------------------------------------------ */
 
-kim_error kim_os_preferences_get_favorite_identities_for_key (kim_preference_key_t       in_key, 
-                                                                kim_favorite_identities  in_hardcoded_default,
-                                                                kim_favorite_identities *out_favorite_identities)
+kim_error kim_os_preferences_get_favorite_identities_for_key (kim_preference_key       in_key, 
+                                                              kim_favorite_identities  in_hardcoded_default,
+                                                              kim_favorite_identities *out_favorite_identities)
 {
     kim_error err = KIM_NO_ERROR;
     CFArrayRef value = NULL;
@@ -286,7 +286,7 @@ kim_error kim_os_preferences_get_favorite_identities_for_key (kim_preference_key
     if (!err) {
         if (!value || CFArrayGetCount (value) < 1) {
             err = kim_favorite_identities_copy (out_favorite_identities, in_hardcoded_default);
-        
+            
         } else {
             kim_favorite_identities favorite_identities = NULL;
             CFIndex count = CFArrayGetCount (value);
@@ -336,8 +336,8 @@ kim_error kim_os_preferences_get_favorite_identities_for_key (kim_preference_key
 
 /* ------------------------------------------------------------------------ */
 
-kim_error kim_os_preferences_set_favorite_identities_for_key (kim_preference_key_t      in_key, 
-                                                                kim_favorite_identities in_favorite_identities)
+kim_error kim_os_preferences_set_favorite_identities_for_key (kim_preference_key      in_key, 
+                                                              kim_favorite_identities in_favorite_identities)
 {
     kim_error err = KIM_NO_ERROR;
     kim_count count = 0;
@@ -348,7 +348,7 @@ kim_error kim_os_preferences_set_favorite_identities_for_key (kim_preference_key
     if (!err) {
         err = kim_favorite_identities_get_number_of_identities (in_favorite_identities, &count);
     }
-
+    
     if (!err) {
         value = CFArrayCreateMutable (kCFAllocatorDefault, count, &kCFTypeArrayCallBacks);
         if (!value) { err = os_error (ENOMEM); }
@@ -367,7 +367,7 @@ kim_error kim_os_preferences_set_favorite_identities_for_key (kim_preference_key
             if (!err) {
                 err = kim_identity_get_string (identity, &string);
             }
-
+            
             if (!err) {
                 err = kim_os_string_get_cfstring (string, &cfstring);
             }
@@ -385,7 +385,7 @@ kim_error kim_os_preferences_set_favorite_identities_for_key (kim_preference_key
     if (!err) {
         err = kim_os_preferences_set_value (in_key, value);
     }
-
+    
     if (value) { CFRelease (value); }
     
     return check_error (err);
@@ -393,9 +393,9 @@ kim_error kim_os_preferences_set_favorite_identities_for_key (kim_preference_key
 
 /* ------------------------------------------------------------------------ */
 
-kim_error kim_os_preferences_get_time_for_key (kim_preference_key_t  in_key,  
-                                                 kim_time            in_hardcoded_default,
-                                                 kim_time           *out_time)
+kim_error kim_os_preferences_get_time_for_key (kim_preference_key  in_key,  
+                                               kim_time            in_hardcoded_default,
+                                               kim_time           *out_time)
 {
     kim_error err = KIM_NO_ERROR;
     CFNumberRef value = NULL;
@@ -427,8 +427,8 @@ kim_error kim_os_preferences_get_time_for_key (kim_preference_key_t  in_key,
 
 /* ------------------------------------------------------------------------ */
 
-kim_error kim_os_preferences_set_time_for_key (kim_preference_key_t in_key, 
-                                                 kim_time           in_time)
+kim_error kim_os_preferences_set_time_for_key (kim_preference_key in_key, 
+                                               kim_time           in_time)
 {
     kim_error err = KIM_NO_ERROR;
     CFNumberRef value = NULL;
@@ -450,9 +450,9 @@ kim_error kim_os_preferences_set_time_for_key (kim_preference_key_t in_key,
 
 /* ------------------------------------------------------------------------ */
 
-kim_error kim_os_preferences_get_lifetime_for_key (kim_preference_key_t  in_key, 
-                                                     kim_lifetime        in_hardcoded_default,
-                                                     kim_lifetime       *out_lifetime)
+kim_error kim_os_preferences_get_lifetime_for_key (kim_preference_key  in_key, 
+                                                   kim_lifetime        in_hardcoded_default,
+                                                   kim_lifetime       *out_lifetime)
 {
     kim_error err = KIM_NO_ERROR;
     CFNumberRef value = NULL;
@@ -484,8 +484,8 @@ kim_error kim_os_preferences_get_lifetime_for_key (kim_preference_key_t  in_key,
 
 /* ------------------------------------------------------------------------ */
 
-kim_error kim_os_preferences_set_lifetime_for_key (kim_preference_key_t in_key, 
-                                                     kim_lifetime       in_lifetime)
+kim_error kim_os_preferences_set_lifetime_for_key (kim_preference_key in_key, 
+                                                   kim_lifetime       in_lifetime)
 {
     kim_error err = KIM_NO_ERROR;
     CFNumberRef value = NULL;
@@ -501,15 +501,15 @@ kim_error kim_os_preferences_set_lifetime_for_key (kim_preference_key_t in_key,
     }
     
     if (value) { CFRelease (value); }
-
+    
     return check_error (err);
 }
 
 /* ------------------------------------------------------------------------ */
 
-kim_error kim_os_preferences_get_boolean_for_key (kim_preference_key_t  in_key, 
-                                                    kim_boolean         in_hardcoded_default,
-                                                    kim_boolean        *out_boolean)
+kim_error kim_os_preferences_get_boolean_for_key (kim_preference_key  in_key, 
+                                                  kim_boolean         in_hardcoded_default,
+                                                  kim_boolean        *out_boolean)
 {
     kim_error err = KIM_NO_ERROR;
     CFBooleanRef value = NULL;
@@ -536,8 +536,8 @@ kim_error kim_os_preferences_get_boolean_for_key (kim_preference_key_t  in_key,
 
 /* ------------------------------------------------------------------------ */
 
-kim_error kim_os_preferences_set_boolean_for_key (kim_preference_key_t in_key, 
-                                                    kim_boolean        in_boolean)
+kim_error kim_os_preferences_set_boolean_for_key (kim_preference_key in_key, 
+                                                  kim_boolean        in_boolean)
 {
     kim_error err = KIM_NO_ERROR;
     CFBooleanRef value = in_boolean ? kCFBooleanTrue : kCFBooleanFalse;
diff --git a/src/kim/lib/mac/kim_os_private.h b/src/kim/lib/mac/kim_os_private.h
index 07cdf91f0..6fb5b8515 100644
--- a/src/kim/lib/mac/kim_os_private.h
+++ b/src/kim/lib/mac/kim_os_private.h
@@ -39,16 +39,16 @@ CFStringRef kim_os_string_get_cfstring_for_key_and_dictionary (CFStringRef in_ke
 CFStringRef kim_os_string_get_cfstring_for_key (kim_string in_key_string);
 
 kim_error kim_os_string_create_from_cfstring (kim_string *out_string,
-                                                CFStringRef   in_cfstring);
+                                              CFStringRef   in_cfstring);
 
 kim_error kim_os_string_create_for_key (kim_string *out_string,
-                                          kim_string  in_key_string);
+                                        kim_string  in_key_string);
 
 kim_error kim_os_string_get_cfstring (kim_string  in_string,
-                                        CFStringRef  *out_cfstring);
+                                      CFStringRef  *out_cfstring);
 
 kim_error kim_os_string_compare_to_cfstring (kim_string      in_string,
-                                               CFStringRef       in_compare_to_cfstring,
-                                               kim_comparison *out_comparison);
+                                             CFStringRef       in_compare_to_cfstring,
+                                             kim_comparison *out_comparison);
 
 #endif /* KIM_PRIVATE_H */
diff --git a/src/kim/lib/mac/kim_os_selection_hints.c b/src/kim/lib/mac/kim_os_selection_hints.c
index 0151324a5..f10b10e8a 100644
--- a/src/kim/lib/mac/kim_os_selection_hints.c
+++ b/src/kim/lib/mac/kim_os_selection_hints.c
@@ -81,7 +81,7 @@ static kim_error kim_os_selection_hints_get_selection_hints_array (CFArrayRef *o
     }
     
     if (value) { CFRelease (value); }
-
+    
     return check_error (err);
 }
 
@@ -113,8 +113,8 @@ static kim_error kim_os_selection_hints_set_selection_hints_array (CFArrayRef in
 /* ------------------------------------------------------------------------ */
 
 static kim_error kim_os_selection_hints_create_dictionary (kim_selection_hints  in_selection_hints,
-                                                             kim_identity         in_identity,
-                                                             CFDictionaryRef       *out_hints_dictionary)
+                                                           kim_identity         in_identity,
+                                                           CFDictionaryRef     *out_hints_dictionary)
 {
     kim_error err = KIM_NO_ERROR;
     kim_selection_hints_preference_strings preference_strings = { NULL, NULL, NULL, NULL, NULL, NULL, NULL };
@@ -134,7 +134,7 @@ static kim_error kim_os_selection_hints_create_dictionary (kim_selection_hints
     if (!err) {
         err = kim_identity_get_string (in_identity, &identity_string);
     }
-
+    
     if (!err) {
         keys[i] = KIM_APPLICATION_ID_HINT;
         err = kim_os_string_get_cfstring (preference_strings.application_identifier, &values[i]);
@@ -144,7 +144,7 @@ static kim_error kim_os_selection_hints_create_dictionary (kim_selection_hints
         keys[++i] = KIM_IDENTITY_HINT;
         err = kim_os_string_get_cfstring (identity_string, &values[i]);
     }
-
+    
     if (!err && preference_strings.service_identity) {
         keys[++i] = KIM_SERVICE_IDENTITY_HINT;
         err = kim_os_string_get_cfstring (preference_strings.service_identity, &values[i]);
@@ -192,8 +192,8 @@ static kim_error kim_os_selection_hints_create_dictionary (kim_selection_hints
 
 /* ------------------------------------------------------------------------ */
 
-static kim_boolean kim_os_selection_hints_compare_hint (kim_string in_string,
-                                                          CFStringRef  in_value)
+static kim_boolean kim_os_selection_hints_compare_hint (kim_string  in_string,
+                                                        CFStringRef in_value)
 {
     kim_boolean equal = 0;
     
@@ -205,7 +205,7 @@ static kim_boolean kim_os_selection_hints_compare_hint (kim_string in_string,
             kim_comparison comparison;
             
             kim_error err = kim_os_string_compare_to_cfstring (in_string, in_value, 
-                                                                 &comparison);
+                                                               &comparison);
             
             if (!err && kim_comparison_is_equal_to (comparison)) {
                 equal = 1;
@@ -216,15 +216,15 @@ static kim_boolean kim_os_selection_hints_compare_hint (kim_string in_string,
             kim_debug_printf ("%s: Malformed string in hints dictionary.", __FUNCTION__);
         }
     }
-
+    
     return equal;
 }
 
 /* ------------------------------------------------------------------------ */
 
 static kim_error kim_os_selection_hints_compare_to_dictionary (kim_selection_hints  in_selection_hints,
-                                                                 CFDictionaryRef        in_hints_dictionary,
-                                                                 kim_boolean         *out_hints_equal)
+                                                               CFDictionaryRef      in_hints_dictionary,
+                                                               kim_boolean         *out_hints_equal)
 {
     kim_error err = KIM_NO_ERROR;
     kim_selection_hints_preference_strings preference_strings = { NULL, NULL, NULL, NULL, NULL, NULL, NULL };
@@ -290,7 +290,7 @@ static kim_error kim_os_selection_hints_compare_to_dictionary (kim_selection_hin
 /* ------------------------------------------------------------------------ */
 
 static kim_error kim_os_selection_hints_get_dictionary_identity (CFDictionaryRef  in_dictionary,
-                                                                   kim_identity  *out_identity)
+                                                                 kim_identity    *out_identity)
 {
     kim_error err = KIM_NO_ERROR;
     CFStringRef identity_cfstr = NULL;
@@ -320,7 +320,7 @@ static kim_error kim_os_selection_hints_get_dictionary_identity (CFDictionaryRef
 /* ------------------------------------------------------------------------ */
 
 kim_error kim_os_selection_hints_lookup_identity (kim_selection_hints  in_selection_hints,
-                                                    kim_identity        *out_identity)
+                                                  kim_identity        *out_identity)
 {
     kim_error err = KIM_NO_ERROR;
     CFArrayRef hints_array = NULL;
@@ -355,27 +355,27 @@ kim_error kim_os_selection_hints_lookup_identity (kim_selection_hints  in_select
             err = kim_os_selection_hints_compare_to_dictionary (in_selection_hints, 
                                                                 dictionary,
                                                                 &found);
-         }
-
+        }
+        
         if (!err && found) {
             found_dictionary = dictionary;
         }
     }
-        
+    
     if (!err && found) {
         err = kim_os_selection_hints_get_dictionary_identity (found_dictionary,
                                                               out_identity);
     }
     
     if (hints_array) { CFRelease (hints_array); }
-
+    
     return check_error (err);
 }
 
 /* ------------------------------------------------------------------------ */
 
 kim_error kim_os_selection_hints_remember_identity (kim_selection_hints in_selection_hints,
-                                                      kim_identity        in_identity)
+                                                    kim_identity        in_identity)
 {
     kim_error err = KIM_NO_ERROR;
     CFArrayRef old_hints_array = NULL;
@@ -391,7 +391,7 @@ kim_error kim_os_selection_hints_remember_identity (kim_selection_hints in_selec
     if (!err) {
         err = kim_os_selection_hints_get_selection_hints_array (&old_hints_array);
     }
-
+    
     if (!err) {
         if (old_hints_array) {
             new_hints_array = CFArrayCreateMutableCopy (kCFAllocatorDefault, 0, 
@@ -431,7 +431,7 @@ kim_error kim_os_selection_hints_remember_identity (kim_selection_hints in_selec
             
             err = kim_os_selection_hints_get_dictionary_identity (dictionary,
                                                                   &identity);
-
+            
             if (!err) {
                 err = kim_identity_compare (in_identity, identity, &comparison);
             }
@@ -457,12 +457,12 @@ kim_error kim_os_selection_hints_remember_identity (kim_selection_hints in_selec
         err = kim_os_selection_hints_create_dictionary (in_selection_hints, 
                                                         in_identity,
                                                         &new_hint_dictionary);
-
+        
         if (!err) {
             CFArrayInsertValueAtIndex (new_hints_array, 0, new_hint_dictionary);
             hints_array_changed = 1;
         }
-
+        
         if (new_hint_dictionary) { CFRelease (new_hint_dictionary); }
     }
     
@@ -472,7 +472,7 @@ kim_error kim_os_selection_hints_remember_identity (kim_selection_hints in_selec
     
     if (new_hints_array ) { CFRelease (new_hints_array); }
     if (old_hints_array ) { CFRelease (old_hints_array); }
-   
+    
     return check_error (err);
 }
 
@@ -485,7 +485,7 @@ kim_error kim_os_selection_hints_forget_identity (kim_selection_hints in_selecti
     CFMutableArrayRef new_hints_array = NULL;
     CFIndex count = 0;
     CFIndex i = 0;
-   
+    
     if (!err && !in_selection_hints) { err = param_error (1, "in_selection_hints", "NULL"); }
     
     if (!err) {
@@ -497,7 +497,7 @@ kim_error kim_os_selection_hints_forget_identity (kim_selection_hints in_selecti
                                                     old_hints_array);
         if (!new_hints_array) { err = os_error (ENOMEM); }
     }
-
+    
     if (!err) {
         count = CFArrayGetCount (new_hints_array);
     }
@@ -532,7 +532,7 @@ kim_error kim_os_selection_hints_forget_identity (kim_selection_hints in_selecti
     }
     
     if (new_hints_array) { CFRelease (new_hints_array); }
-
+    
     return check_error (err);
 }
 
diff --git a/src/kim/lib/mac/kim_os_string.c b/src/kim/lib/mac/kim_os_string.c
index 4ccb2a821..4514da36e 100644
--- a/src/kim/lib/mac/kim_os_string.c
+++ b/src/kim/lib/mac/kim_os_string.c
@@ -90,7 +90,7 @@ CFStringRef kim_os_string_get_cfstring_for_key (kim_string in_key_string)
     
     if (in_key_string) {     
         key = CFStringCreateWithCString (kCFAllocatorDefault, in_key_string, kCFStringEncodingASCII);
-
+        
         if (key) {
             // Try to find the key, first searching in the framework, then in the main bundle
             CFBundleRef frameworkBundle = CFBundleGetBundleWithIdentifier (CFSTR ("edu.mit.Kerberos"));
@@ -100,7 +100,7 @@ CFStringRef kim_os_string_get_cfstring_for_key (kim_string in_key_string)
             
             if (!value) {
                 CFBundleRef mainBundle = CFBundleGetMainBundle ();
-
+                
                 if (mainBundle) {
                     value = kim_os_string_get_cfstring_for_key_and_dictionary (key, mainBundle);
                 }
@@ -121,8 +121,8 @@ CFStringRef kim_os_string_get_cfstring_for_key (kim_string in_key_string)
 
 /* ------------------------------------------------------------------------ */
 
-kim_error kim_os_string_create_from_cfstring (kim_string *out_string,
-                                                CFStringRef in_cfstring)
+kim_error kim_os_string_create_from_cfstring (kim_string  *out_string,
+                                              CFStringRef  in_cfstring)
 {
     kim_error err = KIM_NO_ERROR;
     kim_string string = NULL;
@@ -158,7 +158,7 @@ kim_error kim_os_string_create_from_cfstring (kim_string *out_string,
 /* ------------------------------------------------------------------------ */
 
 kim_error kim_os_string_create_for_key (kim_string *out_string,
-                                          kim_string in_key_string)
+                                        kim_string in_key_string)
 {
     kim_error err = KIM_NO_ERROR;
     CFStringRef value = NULL;
@@ -181,8 +181,8 @@ kim_error kim_os_string_create_for_key (kim_string *out_string,
 
 /* ------------------------------------------------------------------------ */
 
-kim_error kim_os_string_get_cfstring (kim_string  in_string,
-                                        CFStringRef  *out_cfstring)
+kim_error kim_os_string_get_cfstring (kim_string   in_string,
+                                      CFStringRef *out_cfstring)
 {
     kim_error err = KIM_NO_ERROR;
     CFStringRef cfstring = NULL;
@@ -208,8 +208,8 @@ kim_error kim_os_string_get_cfstring (kim_string  in_string,
 /* ------------------------------------------------------------------------ */
 
 kim_error kim_os_string_compare (kim_string      in_string,
-                                   kim_string      in_compare_to_string,
-                                   kim_comparison *out_comparison)
+                                 kim_string      in_compare_to_string,
+                                 kim_comparison *out_comparison)
 {
     kim_error err = KIM_NO_ERROR;
     CFStringRef cfstring = NULL;
@@ -222,7 +222,7 @@ kim_error kim_os_string_compare (kim_string      in_string,
     if (!err) {
         err = kim_os_string_get_cfstring (in_string, &cfstring);
     }
-
+    
     if (!err) {
         err = kim_os_string_get_cfstring (in_compare_to_string, &compare_to_cfstring);
     }
@@ -234,15 +234,15 @@ kim_error kim_os_string_compare (kim_string      in_string,
     
     if (cfstring           ) { CFRelease (cfstring); }
     if (compare_to_cfstring) { CFRelease (compare_to_cfstring); }
-
+    
     return check_error (err);    
 }
 
 /* ------------------------------------------------------------------------ */
 
 kim_error kim_os_string_compare_to_cfstring (kim_string      in_string,
-                                               CFStringRef       in_compare_to_cfstring,
-                                               kim_comparison *out_comparison)
+                                             CFStringRef     in_compare_to_cfstring,
+                                             kim_comparison *out_comparison)
 {
     kim_error err = KIM_NO_ERROR;
     CFStringRef cfstring = NULL;