diff options
| author | Alexandra Ellwood <lxs@mit.edu> | 2008-09-30 20:05:17 +0000 |
|---|---|---|
| committer | Alexandra Ellwood <lxs@mit.edu> | 2008-09-30 20:05:17 +0000 |
| commit | 6b6d24e1ae0aadffb9062ac94ae8e600e09dbef0 (patch) | |
| tree | 2bddd1c4440a027ef8f1ee702bc53c0872de3703 /src/kim/lib/kim_string.c | |
| parent | 7dea4900af23686834aa9c899206438a8d27076a (diff) | |
| download | krb5-6b6d24e1ae0aadffb9062ac94ae8e600e09dbef0.tar.gz krb5-6b6d24e1ae0aadffb9062ac94ae8e600e09dbef0.tar.xz krb5-6b6d24e1ae0aadffb9062ac94ae8e600e09dbef0.zip | |
krb5 library-side changes for com_err based error strings
ticket: 6138
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20786 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kim/lib/kim_string.c')
| -rw-r--r-- | src/kim/lib/kim_string.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/kim/lib/kim_string.c b/src/kim/lib/kim_string.c index 2dc284c93..b84a12c8e 100644 --- a/src/kim/lib/kim_string.c +++ b/src/kim/lib/kim_string.c @@ -32,7 +32,7 @@ kim_error kim_string_create_from_format (kim_string *out_string, kim_string in_format, ...) { - kim_error err = KIM_NO_ERROR; + kim_error err = kim_library_init (); va_list args; va_start (args, in_format); @@ -48,7 +48,7 @@ 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_NO_ERROR; + 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); } @@ -62,7 +62,7 @@ kim_error kim_string_create_from_format_va (kim_string *out_string, kim_string in_format, va_list in_args) { - kim_error err = KIM_NO_ERROR; + kim_error err = kim_library_init (); kim_string string = NULL; if (!err && !out_string) { err = check_error (KIM_NULL_PARAMETER_ERR); } @@ -90,7 +90,7 @@ kim_error kim_string_create_from_buffer (kim_string *out_string, const char *in_buffer, kim_count in_length) { - kim_error err = KIM_NO_ERROR; + kim_error err = kim_library_init (); kim_string string = NULL; if (!err && !out_string) { err = check_error (KIM_NULL_PARAMETER_ERR); } @@ -117,7 +117,11 @@ kim_error kim_string_create_from_buffer (kim_string *out_string, kim_error kim_string_create_for_last_error (kim_string *out_string, kim_error in_error) { - return kim_string_copy (out_string, kim_error_message (in_error)); + kim_error err = kim_library_init (); + + err = kim_string_copy (out_string, kim_error_message (in_error)); + + return check_error (err); } /* ------------------------------------------------------------------------ */ @@ -125,7 +129,7 @@ kim_error kim_string_create_for_last_error (kim_string *out_string, kim_error kim_string_copy (kim_string *out_string, kim_string in_string) { - kim_error err = KIM_NO_ERROR; + kim_error err = kim_library_init (); kim_string string = NULL; if (!err && !out_string) { err = check_error (KIM_NULL_PARAMETER_ERR); } @@ -137,7 +141,7 @@ kim_error kim_string_copy (kim_string *out_string, } if (!err) { - strcpy ((char *) string, in_string); + strncpy ((char *) string, in_string, strlen (in_string) + 1); *out_string = string; string = NULL; } |