diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2014-07-23 21:15:48 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2014-07-23 21:15:48 +0000 |
| commit | 995eb6d91740dfda77e738334a046d813c982150 (patch) | |
| tree | 7288518e82309b63323404f272ff7f545b44d5c8 /libgphoto2/gphoto2-context.c | |
| parent | 9e91489b701f29f964bb6e882c15810f052f7958 (diff) | |
| download | libgphoto2-995eb6d91740dfda77e738334a046d813c982150.tar.gz | |
From: Axel Waggershauser <awagger@web.de>
rewrote the ptp_opensession error retry code
changed some more error logging handling
detailed:
a) yet another logging/cleanup patch improving the code and error log
readability in this specific situation:
* extend translate_ptp_results to better handle PTP_ERROR_IO
* log the failure of ptp_opensession
* make the ptp_opensession error handling code clearer
* don't report a 'ptp_port' error inside the CHECK_INIT macro
when gp_camera_init fails in gphoto-camera.c. There is no
port error string mechanism involved and the original error has
been reported already from inside camera_init
* don't report the source location when logging the error string
inside gp_context_error(). interesting would be the original
source location but that is not available there.
* remove one of two different strings conveying the same
information: 'No additional information available.' and
'No error description available'
* improve logging in existing CHECK_RESULT_OPEN_CLOSE macro
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@15110 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'libgphoto2/gphoto2-context.c')
| -rw-r--r-- | libgphoto2/gphoto2-context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libgphoto2/gphoto2-context.c b/libgphoto2/gphoto2-context.c index f77e8c1ad..ec3d1daf6 100644 --- a/libgphoto2/gphoto2-context.c +++ b/libgphoto2/gphoto2-context.c @@ -271,7 +271,7 @@ gp_context_error (GPContext *context, const char *format, ...) va_end (args); /* Log the error message */ - GP_LOG_E ("%s", str); + gp_log( GP_LOG_ERROR, __func__, "%s", str); if (context && context->error_func) context->error_func (context, str, context->error_func_data); |