From b13ddadad16b2b39ad00cef1ceb19c865335c0ae Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Mon, 24 May 2010 20:53:46 +0200 Subject: better error handling in library loader --- src/library/loader.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/library/loader.c b/src/library/loader.c index 93b9298..1606557 100644 --- a/src/library/loader.c +++ b/src/library/loader.c @@ -93,7 +93,11 @@ wolf_error_t wolf_library_unload( wolf_library_p l ) { BOOL res = FALSE; #endif - if( l == NULL || l->handle == NULL ) { + if( l == NULL ) { + return WOLF_OK; + } + + if( l->handle == NULL ) { return WOLF_ERR_INVALID_STATE; } @@ -121,13 +125,8 @@ wolf_error_t wolf_library_unload( wolf_library_p l ) { return WOLF_OK; } -char *wolf_library_errmsg( const wolf_error_t error, const wolf_library_p library, char *buf, size_t buflen ) { - (void)wolf_error_msg( error, buf, buflen ); - strncat( buf, " - ", buflen - strlen( buf ) ); - if( error == WOLF_ERR_INTERNAL ) { - strncat( buf, library->errbuf, buflen - strlen( buf ) ); - } - +char *wolf_library_error_msg( const wolf_library_p library, char *buf, size_t buflen ) { + strncpy( buf, library->errbuf, buflen ); return buf; } -- cgit v1.2.3-54-g00ecf