diff options
Diffstat (limited to 'src/kim/lib/mac/kim_os_string.c')
| -rw-r--r-- | src/kim/lib/mac/kim_os_string.c | 112 |
1 files changed, 56 insertions, 56 deletions
diff --git a/src/kim/lib/mac/kim_os_string.c b/src/kim/lib/mac/kim_os_string.c index 96573eec9e..944b8c995f 100644 --- a/src/kim/lib/mac/kim_os_string.c +++ b/src/kim/lib/mac/kim_os_string.c @@ -8,7 +8,7 @@ * require a specific license from the United States Government. * It is the responsibility of any person or organization contemplating * export to obtain such a license before exporting. - * + * * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and * distribute this software and its documentation for any purpose and * without fee is hereby granted, provided that the above copyright @@ -37,14 +37,14 @@ kim_error kim_os_string_create_localized (kim_string *out_string, kim_error err = lock_err; kim_string string = NULL; CFStringRef cfkey = NULL; - + if (!err && !out_string) { err = check_error (KIM_NULL_PARAMETER_ERR); } if (!err && !in_string ) { err = check_error (KIM_NULL_PARAMETER_ERR); } - + if (!err) { err = kim_os_string_get_cfstring (in_string, &cfkey); } - + if (!err && kim_library_allow_home_directory_access ()) { CFStringRef cfstring = NULL; CFBundleRef framework = CFBundleGetBundleWithIdentifier (CFSTR ("edu.mit.Kerberos")); @@ -56,35 +56,35 @@ kim_error kim_os_string_create_localized (kim_string *out_string, framework, ""); } - + if (main_bundle && !cfstring) { cfstring = CFCopyLocalizedStringFromTableInBundle (cfkey, CFSTR ("InfoPlist"), main_bundle, ""); - } - + } + if (!err && cfstring) { err = kim_os_string_create_from_cfstring (&string, cfstring); } - + if (cfstring) { CFRelease (cfstring); } } - + if (!err && !string) { err = kim_string_copy (&string, in_string); } - + if (!err) { *out_string = string; string = NULL; } - + if (cfkey) { CFRelease (cfkey); } kim_string_free (&string); - + if (!lock_err) { kim_os_library_unlock_for_bundle_lookup (); } - + return check_error (err); } @@ -96,47 +96,47 @@ kim_error kim_os_string_create_from_cfstring (kim_string *out_string, kim_error err = KIM_NO_ERROR; kim_string string = NULL; CFIndex length = 0; - + if (!err && !out_string ) { err = check_error (KIM_NULL_PARAMETER_ERR); } if (!err && !in_cfstring) { err = check_error (KIM_NULL_PARAMETER_ERR); } - + if (!err) { char *ptr = NULL; - - /* check if in_cfstring is a C string internally so we can + + /* check if in_cfstring is a C string internally so we can * avoid using CFStringGetMaximumSizeForEncoding which is wasteful */ - ptr = (char *) CFStringGetCStringPtr(in_cfstring, + ptr = (char *) CFStringGetCStringPtr(in_cfstring, kCFStringEncodingUTF8); if (ptr) { string = strdup (ptr); if (!string) { err = check_error (KIM_OUT_OF_MEMORY_ERR); } } else { - length = CFStringGetMaximumSizeForEncoding (CFStringGetLength (in_cfstring), + length = CFStringGetMaximumSizeForEncoding (CFStringGetLength (in_cfstring), kCFStringEncodingUTF8) + 1; - + string = (char *) calloc (length, sizeof (char)); if (!string) { err = check_error (KIM_OUT_OF_MEMORY_ERR); } - + if (!err) { - if (!CFStringGetCString (in_cfstring, - (char *) string, - length, + if (!CFStringGetCString (in_cfstring, + (char *) string, + length, kCFStringEncodingUTF8)) { err = KIM_OUT_OF_MEMORY_ERR; - } - } + } + } } } - - + + if (!err) { *out_string = string; string = NULL; } - + kim_string_free (&string); - + return check_error (err); } @@ -147,24 +147,24 @@ kim_error kim_os_string_get_cfstring (kim_string in_string, { kim_error err = KIM_NO_ERROR; CFStringRef cfstring = NULL; - + if (!err && !in_string ) { err = check_error (KIM_NULL_PARAMETER_ERR); } if (!err && !out_cfstring) { err = check_error (KIM_NULL_PARAMETER_ERR); } - + if (!err) { - cfstring = CFStringCreateWithCString (kCFAllocatorDefault, - in_string, + cfstring = CFStringCreateWithCString (kCFAllocatorDefault, + in_string, kCFStringEncodingUTF8); if (!cfstring) { err = KIM_OUT_OF_MEMORY_ERR; } } - + if (!err) { *out_cfstring = cfstring; cfstring = NULL; } - + if (cfstring) { CFRelease (cfstring); } - + return check_error (err); } @@ -178,34 +178,34 @@ kim_error kim_os_string_compare (kim_string in_string, kim_error err = KIM_NO_ERROR; CFStringRef cfstring = NULL; CFStringRef compare_to_cfstring = NULL; - + if (!err && !in_string ) { err = check_error (KIM_NULL_PARAMETER_ERR); } if (!err && !in_compare_to_string) { err = check_error (KIM_NULL_PARAMETER_ERR); } if (!err && !out_comparison ) { err = check_error (KIM_NULL_PARAMETER_ERR); } - + if (!err) { - err = kim_os_string_get_cfstring (in_string, + err = kim_os_string_get_cfstring (in_string, &cfstring); } - + if (!err) { - err = kim_os_string_get_cfstring (in_compare_to_string, + err = kim_os_string_get_cfstring (in_compare_to_string, &compare_to_cfstring); } - + if (!err) { - CFOptionFlags options = (in_case_insensitive ? + CFOptionFlags options = (in_case_insensitive ? 1 : kCFCompareCaseInsensitive); - + /* Returned CFComparisonResult is compatible with kim_comparison_t */ - *out_comparison = CFStringCompare (cfstring, - compare_to_cfstring, - options); + *out_comparison = CFStringCompare (cfstring, + compare_to_cfstring, + options); } - + if (cfstring ) { CFRelease (cfstring); } if (compare_to_cfstring) { CFRelease (compare_to_cfstring); } - + return check_error (err); } @@ -217,21 +217,21 @@ kim_error kim_os_string_compare_to_cfstring (kim_string in_string, { kim_error err = KIM_NO_ERROR; CFStringRef cfstring = NULL; - + if (!err && !in_string ) { err = check_error (KIM_NULL_PARAMETER_ERR); } if (!err && !in_compare_to_cfstring) { err = check_error (KIM_NULL_PARAMETER_ERR); } if (!err && !out_comparison ) { err = check_error (KIM_NULL_PARAMETER_ERR); } - + if (!err) { err = kim_os_string_get_cfstring (in_string, &cfstring); } - + if (!err) { /* Returned CFComparisonResult is compatible with kim_comparison_t */ - *out_comparison = CFStringCompare (cfstring, in_compare_to_cfstring, 0); + *out_comparison = CFStringCompare (cfstring, in_compare_to_cfstring, 0); } - + if (cfstring) { CFRelease (cfstring); } - + return check_error (err); } |