diff options
Diffstat (limited to 'src/kim/lib/kim_string.c')
| -rw-r--r-- | src/kim/lib/kim_string.c | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/src/kim/lib/kim_string.c b/src/kim/lib/kim_string.c index 8b9af7010e..6cf18c46e0 100644 --- a/src/kim/lib/kim_string.c +++ b/src/kim/lib/kim_string.c @@ -30,87 +30,87 @@ const char kim_empty_string[1] = ""; /* ------------------------------------------------------------------------ */ -kim_error kim_string_create_from_format (kim_string *out_string, +kim_error kim_string_create_from_format (kim_string *out_string, kim_string in_format, ...) { kim_error err = kim_library_init (); va_list args; - + va_start (args, in_format); err = kim_string_create_from_format_va (out_string, in_format, args); va_end (args); - - return check_error (err); + + return check_error (err); } /* ------------------------------------------------------------------------ */ -kim_error kim_string_create_from_format_va_retcode (kim_string *out_string, +kim_error kim_string_create_from_format_va_retcode (kim_string *out_string, kim_string in_format, va_list in_args) { kim_error err = kim_library_init (); - + int count = vasprintf ((char **) out_string, in_format, in_args); if (count < 0) { err = check_error (KIM_OUT_OF_MEMORY_ERR); } - + return err; } /* ------------------------------------------------------------------------ */ -kim_error kim_string_create_from_format_va (kim_string *out_string, +kim_error kim_string_create_from_format_va (kim_string *out_string, kim_string in_format, va_list in_args) { kim_error err = kim_library_init (); kim_string string = NULL; - + if (!err && !out_string) { err = check_error (KIM_NULL_PARAMETER_ERR); } if (!err && !in_format ) { err = check_error (KIM_NULL_PARAMETER_ERR); } - + if (!err) { - err = kim_string_create_from_format_va_retcode (&string, - in_format, + err = kim_string_create_from_format_va_retcode (&string, + in_format, in_args); } - + if (!err) { *out_string = string; string = NULL; } - + if (string) { kim_string_free (&string); } - + return check_error (err); } /* ------------------------------------------------------------------------ */ -kim_error kim_string_create_from_buffer (kim_string *out_string, - const char *in_buffer, +kim_error kim_string_create_from_buffer (kim_string *out_string, + const char *in_buffer, kim_count in_length) { kim_error err = kim_library_init (); kim_string string = NULL; - + if (!err && !out_string) { err = check_error (KIM_NULL_PARAMETER_ERR); } if (!err && !in_buffer ) { err = check_error (KIM_NULL_PARAMETER_ERR); } - + if (!err) { string = calloc (in_length + 1, sizeof (char *)); if (!string) { err = check_error (KIM_OUT_OF_MEMORY_ERR); } } - + if (!err) { memcpy ((char *) string, in_buffer, in_length * sizeof (char)); *out_string = string; string = NULL; } - + kim_string_free (&string); - + return check_error (err); } @@ -128,20 +128,20 @@ kim_error kim_string_create_for_last_error (kim_string *out_string, /* ------------------------------------------------------------------------ */ -kim_error kim_string_copy (kim_string *out_string, +kim_error kim_string_copy (kim_string *out_string, kim_string in_string) { kim_error err = kim_library_init (); kim_string string = 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) { if (in_string[0]) { string = calloc (strlen (in_string) + 1, sizeof (char *)); if (!string) { err = check_error (KIM_OUT_OF_MEMORY_ERR); } - + if (!err) { strncpy ((char *) string, in_string, strlen (in_string) + 1); } @@ -149,25 +149,25 @@ kim_error kim_string_copy (kim_string *out_string, string = kim_empty_string; } } - + if (!err) { *out_string = string; string = NULL; } - + kim_string_free (&string); - + return check_error (err); } /* ------------------------------------------------------------------------ */ -kim_error kim_string_compare (kim_string in_string, +kim_error kim_string_compare (kim_string in_string, kim_string in_compare_to_string, kim_comparison *out_comparison) { - return kim_os_string_compare (in_string, - in_compare_to_string, + return kim_os_string_compare (in_string, + in_compare_to_string, 0, /* case sensitive */ out_comparison); } @@ -176,7 +176,7 @@ kim_error kim_string_compare (kim_string in_string, void kim_string_free (kim_string *io_string) { - if (io_string && *io_string && *io_string != kim_empty_string) { + if (io_string && *io_string && *io_string != kim_empty_string) { free ((char *) *io_string); *io_string = NULL; } |