eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-11 19:00:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplify global error call.

Browse Source 
git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@622 36d66b0a-2a48-0410-832c-cd162a569da5
This commit is contained in:
Milan Broz
2011-10-09 13:45:38 +00:00
parent 4e9fa4d2bb
commit d7960b9307
5 changed files with 29 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/setup.c
View File

@@ -73,6 +73,10 @@ struct crypt_device {
void *password_usrptr;
};
/* Global error */
/* FIXME: not thread safe, remove this later */
static char global_error[512] = {0};
/* Log helper */
static void (*_default_log)(int level, const char *msg, void *usrptr) = NULL;
static int _debug_level = 0;
@@ -87,6 +91,7 @@ int crypt_get_debug_level(void)
return _debug_level;
}
void crypt_log(struct crypt_device *cd, int level, const char *msg)
{
if (cd && cd->log)
@@ -95,6 +100,16 @@ void crypt_log(struct crypt_device *cd, int level, const char *msg)
_default_log(level, msg, NULL);
}
/* Set global error, ugly hack... */
void set_global_error(const char *error)
{
size_t size = strlen(error);
strncpy(global_error, error, sizeof(global_error) - 2);
if (size < sizeof(global_error) && global_error[size - 1] == '\n')
global_error[size - 1] = '\0';
}
__attribute__((format(printf, 5, 6)))
void logger(struct crypt_device *cd, int level, const char *file,
int line, const char *format, ...)
@@ -104,7 +119,7 @@ void logger(struct crypt_device *cd, int level, const char *file,
va_start(argp, format);
if (vasprintf(&target, format, argp) > 0) {
if (vasprintf(&target, format, argp) > 0 ) {
if (level >= 0) {
crypt_log(cd, level, target);
#ifdef CRYPT_DEBUG
@@ -114,6 +129,9 @@ void logger(struct crypt_device *cd, int level, const char *file,
} else if (_debug_level)
printf("# %s\n", target);
#endif
if (level == CRYPT_LOG_ERROR)
set_global_error(target);
}
va_end(argp);
@@ -411,16 +429,15 @@ void crypt_set_password_callback(struct crypt_device *cd,
cd->password_usrptr = usrptr;
}
/* Deprecated global error interface */
void crypt_get_error(char *buf, size_t size)
{
const char *error = get_error();
if (!buf || size < 1)
set_error(NULL);
else if (error) {
strncpy(buf, error, size - 1);
global_error[0] = '\0';
else if (*global_error) {
strncpy(buf, global_error, size - 1);
buf[size - 1] = '\0';
set_error(NULL);
global_error[0] = '\0';
} else
buf[0] = '\0';
}