diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/audio_out/audio_alsa_out.c | 4 | ||||
| -rw-r--r-- | src/audio_out/audio_esd_out.c | 2 | ||||
| -rw-r--r-- | src/xine-engine/load_plugins.c | 18 |
3 files changed, 14 insertions, 10 deletions
diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c index 4a3d84b59..44dd0f2f9 100644 --- a/src/audio_out/audio_alsa_out.c +++ b/src/audio_out/audio_alsa_out.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_alsa_out.c,v 1.2 2001/04/27 10:42:38 f1rmb Exp $ + * $Id: audio_alsa_out.c,v 1.3 2001/04/27 11:32:39 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -624,7 +624,7 @@ static void sighandler(int signum) { /* * */ -ao_functions_t *audio_alsaout_init(int iface, config_values_t *config) { +ao_functions_t *init_audio_out_plugin (int iface, config_values_t *config) { int best_rate; int devnum; int err; diff --git a/src/audio_out/audio_esd_out.c b/src/audio_out/audio_esd_out.c index 6200d5d18..f9409842a 100644 --- a/src/audio_out/audio_esd_out.c +++ b/src/audio_out/audio_esd_out.c @@ -305,7 +305,7 @@ static ao_functions_t audio_esdout = { }; -ao_functions_t *audio_esdout_init (int iface, config_values_t *config) +ao_functions_t *init_audio_out_plugin (int iface, config_values_t *config) { int audio_fd; diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index 53b7500da..4ff20ecf2 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: load_plugins.c,v 1.9 2001/04/27 10:42:38 f1rmb Exp $ + * $Id: load_plugins.c,v 1.10 2001/04/27 11:32:39 f1rmb Exp $ * * * Load input/demux/audio_out/video_out/codec plugins @@ -349,7 +349,7 @@ vo_driver_t *xine_load_video_output_plugin(config_values_t *config, char *filename, char *id, int visual_type, void *visual) { DIR *dir; - vo_driver_t *vod; + vo_driver_t *vod = NULL; if((filename == NULL && id == NULL) || visual == NULL || config == NULL) { printf("%s(%s@%d): parameter(s) should be non null.\n", @@ -365,9 +365,11 @@ vo_driver_t *xine_load_video_output_plugin(config_values_t *config, while ((pEntry = readdir (dir)) != NULL) { char str[1024]; void *plugin; - int nLen = strlen (pEntry->d_name); + vod = NULL; + memset(&str, 0, 1024); + if ((strncasecmp(pEntry->d_name, XINE_VIDEO_OUT_PLUGIN_PREFIXNAME, XINE_VIDEO_OUT_PLUGIN_PREFIXNAME_LENGTH) == 0) && @@ -377,8 +379,8 @@ vo_driver_t *xine_load_video_output_plugin(config_values_t *config, && (pEntry->d_name[nLen-1]=='o'))) { sprintf (str, "%s/%s", XINE_PLUGINDIR, pEntry->d_name); - - if(filename) { /* load by name */ + + if(filename) { /* load by name */ if(!strncasecmp(filename, pEntry->d_name, strlen(pEntry->d_name))) { if(!(plugin = dlopen (str, RTLD_LAZY))) { @@ -439,7 +441,7 @@ char **enum_video_output_plugins(int visual_type) { ao_functions_t *xine_load_audio_output_plugin(config_values_t *config, char *filename, char *id) { DIR *dir; - ao_functions_t *aod; + ao_functions_t *aod = NULL; if(filename == NULL && id == NULL) { printf("%s(%s@%d): parameter(s) should be non null.\n", @@ -455,8 +457,10 @@ ao_functions_t *xine_load_audio_output_plugin(config_values_t *config, while ((pEntry = readdir (dir)) != NULL) { char str[1024]; void *plugin; - int nLen = strlen (pEntry->d_name); + + aod = NULL; + memset(&str, 0, 1024); if ((strncasecmp(pEntry->d_name, XINE_AUDIO_OUT_PLUGIN_PREFIXNAME, |