From 2578127f4e1498bbe514cc8407fd575fb4865994 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Tue, 18 Sep 2007 15:52:21 +0000 Subject: [PATCH] Remove remaining strerror() calls from core - refs #1297 --- src/extras/libc.c | 2 +- src/interface/interaction.c | 2 +- src/libvlc-common.c | 12 ++++++------ src/misc/image.c | 7 +++++-- src/modules/configuration.c | 14 ++++++-------- src/modules/modules.c | 7 +++---- src/playlist/loadsave.c | 4 ++-- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/extras/libc.c b/src/extras/libc.c index 4be2dd27f5..03321034bf 100644 --- a/src/extras/libc.c +++ b/src/extras/libc.c @@ -947,7 +947,7 @@ int __vlc_execve( vlc_object_t *p_object, int i_argc, char *const *ppsz_argv, switch (pid) { case -1: - msg_Err (p_object, "unable to fork (%s)", strerror (errno)); + msg_Err (p_object, "unable to fork (%m)"); close (fds[0]); close (fds[1]); return -1; diff --git a/src/interface/interaction.c b/src/interface/interaction.c index 1a991ce018..1382fdb276 100644 --- a/src/interface/interaction.c +++ b/src/interface/interaction.c @@ -35,7 +35,7 @@ #include /* free(), strtol() */ #include /* FILE */ -#include /* strerror() */ +#include #include #include diff --git a/src/libvlc-common.c b/src/libvlc-common.c index 35a8479ed6..61f2842b22 100644 --- a/src/libvlc-common.c +++ b/src/libvlc-common.c @@ -41,7 +41,7 @@ #include /* ENOMEM */ #include /* sprintf() */ -#include /* strerror() */ +#include #include /* free() */ #ifndef WIN32 @@ -374,8 +374,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) } else { - msg_Err( p_libvlc, "cannot open pid file for writing: %s (%s)", - psz_pidfile, strerror(errno) ); + msg_Err( p_libvlc, "cannot open pid file for writing: %s (%m)", + psz_pidfile ); } } free( psz_pidfile ); @@ -1035,8 +1035,8 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, vlc_bool_t b_release ) msg_Dbg( p_libvlc, "removing pid file %s", psz_pidfile ); if( unlink( psz_pidfile ) == -1 ) { - msg_Dbg( p_libvlc, "removing pid file %s: failed: %s", - psz_pidfile, strerror(errno) ); + msg_Dbg( p_libvlc, "removing pid file %s: %m", + psz_pidfile ); } } free ( psz_pidfile ); @@ -1210,7 +1210,7 @@ static inline int LoadMessages (void) } /* LibVLC wants all messages in UTF-8. - * Unfortunately, we cannot ask UTF-8 for strerror(), strsignal() + * Unfortunately, we cannot ask UTF-8 for strerror_r(), strsignal_r() * and other functions that are not part of our text domain. */ if (bind_textdomain_codeset (PACKAGE_NAME, "UTF-8") == NULL) diff --git a/src/misc/image.c b/src/misc/image.c index 0d5470d3a7..463b43ce23 100644 --- a/src/misc/image.c +++ b/src/misc/image.c @@ -352,7 +352,7 @@ static int ImageWriteUrl( image_handler_t *p_image, picture_t *p_pic, file = utf8_fopen( psz_url, "wb" ); if( !file ) { - msg_Err( p_image->p_parent, "%s: %s", psz_url, strerror( errno ) ); + msg_Err( p_image->p_parent, "%s: %m", psz_url ); return VLC_EGENERIC; } @@ -370,7 +370,10 @@ static int ImageWriteUrl( image_handler_t *p_image, picture_t *p_pic, err = errno; if( err ) - msg_Err( p_image->p_parent, "%s: %s", psz_url, strerror( err ) ); + { + errno = err; + msg_Err( p_image->p_parent, "%s: %m", psz_url ); + } return err ? VLC_EGENERIC : VLC_SUCCESS; } diff --git a/src/modules/configuration.c b/src/modules/configuration.c index 4e74b417ee..064ac41f7d 100644 --- a/src/modules/configuration.c +++ b/src/modules/configuration.c @@ -799,8 +799,8 @@ static FILE *config_OpenConfigFile( vlc_object_t *p_obj, const char *mode ) p_stream = utf8_fopen( psz_filename, mode ); if( p_stream == NULL && errno != ENOENT ) { - msg_Err( p_obj, "cannot open config file (%s): %s", - psz_filename, strerror(errno) ); + msg_Err( p_obj, "cannot open config file (%s): %m", + psz_filename ); } #if !( defined(WIN32) || defined(__APPLE__) || defined(SYS_BEOS) ) @@ -988,9 +988,8 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name ) { long l = strtoi (psz_option_value); if (errno) - msg_Warn (p_this, "Integer value (%s) for %s: %s", - psz_option_value, psz_option_name, - strerror (errno)); + msg_Warn (p_this, "Integer value (%s) for %s: %m", + psz_option_value, psz_option_name); else p_item->saved.i = p_item->value.i = (int)l; break; @@ -1030,7 +1029,7 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name ) if (ferror (file)) { - msg_Err (p_this, "error reading configuration: %s", strerror (errno)); + msg_Err (p_this, "error reading configuration: %m"); clearerr (file); } fclose (file); @@ -1069,8 +1068,7 @@ int config_CreateDir( vlc_object_t *p_this, const char *psz_dirname ) } free( psz_parent ); } - msg_Err( p_this, "could not create %s (%s)", - psz_dirname, strerror(errno) ); + msg_Err( p_this, "could not create %s: %m", psz_dirname ); return -1; } diff --git a/src/modules/modules.c b/src/modules/modules.c index ec3b393b6b..66135e2fce 100644 --- a/src/modules/modules.c +++ b/src/modules/modules.c @@ -1370,8 +1370,8 @@ static int CallEntry( module_t * p_module ) msg_Warn( p_module, "cannot find symbol \"%s\" in file `%s' (%s)", psz_name, p_module->psz_filename, dlerror() ); #elif defined(HAVE_DL_SHL_LOAD) - msg_Warn( p_module, "cannot find symbol \"%s\" in file `%s' (%s)", - psz_name, p_module->psz_filename, strerror(errno) ); + msg_Warn( p_module, "cannot find symbol \"%s\" in file `%s' (%m)", + psz_name, p_module->psz_filename ); #else # error "Something is wrong in modules.c" #endif @@ -1503,8 +1503,7 @@ static int LoadModule( vlc_object_t *p_this, char *psz_file, handle = shl_load( psz_file, BIND_IMMEDIATE | BIND_NONFATAL, NULL ); if( handle == NULL ) { - msg_Warn( p_this, "cannot load module `%s' (%s)", - psz_file, strerror(errno) ); + msg_Warn( p_this, "cannot load module `%s' (%m)", psz_file ); return -1; } diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c index 2d48375da5..55db54d255 100644 --- a/src/playlist/loadsave.c +++ b/src/playlist/loadsave.c @@ -55,8 +55,8 @@ int playlist_Export( playlist_t * p_playlist, const char *psz_filename , p_export->p_file = utf8_fopen( psz_filename, "wt" ); if( !p_export->p_file ) { - msg_Err( p_playlist , "could not create playlist file %s" - " (%s)", psz_filename, strerror(errno) ); + msg_Err( p_playlist , "could not create playlist file %s (%m)", + psz_filename ); return VLC_EGENERIC; } -- 2.39.5