oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

krb5_context: embed mutex in structure

Browse Source 
Instead of allocating a separate mutex object on the heap,
include the HEIMDAL_MUTEX in the krb5_context structure.

Change-Id: If6db484177410487176985e43e3b43e0f2166518
This commit is contained in:
Nicolas Williams
2016-03-31 22:06:37 -05:00
committed by Jeffrey Altman
parent 1f53a40827
commit c80816f9c3
5 changed files with 20 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/krb5/error_string.c
View File

@@ -47,12 +47,12 @@
KRB5_LIB_FUNCTION void KRB5_LIB_CALL
krb5_clear_error_message(krb5_context context)
{
HEIMDAL_MUTEX_lock(context->mutex);
HEIMDAL_MUTEX_lock(&context->mutex);
if (context->error_string)
free(context->error_string);
context->error_code = 0;
context->error_string = NULL;
HEIMDAL_MUTEX_unlock(context->mutex);
HEIMDAL_MUTEX_unlock(&context->mutex);
}
/**
@@ -105,7 +105,7 @@ krb5_vset_error_message (krb5_context context, krb5_error_code ret,
if (context == NULL)
return;
HEIMDAL_MUTEX_lock(context->mutex);
HEIMDAL_MUTEX_lock(&context->mutex);
if (context->error_string) {
free(context->error_string);
context->error_string = NULL;
@@ -114,7 +114,7 @@ krb5_vset_error_message (krb5_context context, krb5_error_code ret,
r = vasprintf(&context->error_string, fmt, args);
if (r < 0)
context->error_string = NULL;
HEIMDAL_MUTEX_unlock(context->mutex);
HEIMDAL_MUTEX_unlock(&context->mutex);
if (context->error_string)
_krb5_debug(context, 100, "error message: %s: %d", context->error_string, ret);
}
@@ -168,13 +168,13 @@ krb5_vprepend_error_message(krb5_context context, krb5_error_code ret,
if (context == NULL)
return;
HEIMDAL_MUTEX_lock(context->mutex);
HEIMDAL_MUTEX_lock(&context->mutex);
if (context->error_code != ret) {
HEIMDAL_MUTEX_unlock(context->mutex);
HEIMDAL_MUTEX_unlock(&context->mutex);
return;
}
if (vasprintf(&str, fmt, args) < 0 || str == NULL) {
HEIMDAL_MUTEX_unlock(context->mutex);
HEIMDAL_MUTEX_unlock(&context->mutex);
return;
}
if (context->error_string) {
@@ -189,7 +189,7 @@ krb5_vprepend_error_message(krb5_context context, krb5_error_code ret,
free(str);
} else
context->error_string = str;
HEIMDAL_MUTEX_unlock(context->mutex);
HEIMDAL_MUTEX_unlock(&context->mutex);
}
/**
@@ -226,13 +226,13 @@ krb5_get_error_message(krb5_context context, krb5_error_code code)
*/
if (context)
{
HEIMDAL_MUTEX_lock(context->mutex);
HEIMDAL_MUTEX_lock(&context->mutex);
if (context->error_string &&
(code == context->error_code || context->error_code == 0))
{
str = strdup(context->error_string);
}
HEIMDAL_MUTEX_unlock(context->mutex);
HEIMDAL_MUTEX_unlock(&context->mutex);
if (str)
return str;