diff options
| author | Bastien Nocera <hadess@users.sourceforge.net> | 2003-12-10 00:54:25 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@users.sourceforge.net> | 2003-12-10 00:54:25 +0000 |
| commit | 17c0d3aed1f09676ee97da972e01e7dfa35a97b6 (patch) | |
| tree | fd1632d715720da8b8d9f2610ccd28f0defea5bf | |
| parent | 31aa4a19da2de6bf3299d64a73bc2a1d39a0474a (diff) | |
| download | xine-lib-17c0d3aed1f09676ee97da972e01e7dfa35a97b6.tar.gz xine-lib-17c0d3aed1f09676ee97da972e01e7dfa35a97b6.tar.bz2 | |
- remove XINE_LANG_LABEL_MAX_SIZE, there's already XINE_LANG_MAX for that
- make sure that the strings copied with strncpy are null-terminated
- fix HAVE_STDLIB_H warning compiling the MNG demuxer
CVS patchset: 5883
CVS date: 2003/12/10 00:54:25
| -rw-r--r-- | include/xine.h.in | 5 | ||||
| -rw-r--r-- | src/demuxers/demux_mng.c | 7 | ||||
| -rw-r--r-- | src/demuxers/demux_ogg.c | 12 |
3 files changed, 15 insertions, 9 deletions
diff --git a/include/xine.h.in b/include/xine.h.in index ec85ac583..e603cb2b9 100644 --- a/include/xine.h.in +++ b/include/xine.h.in @@ -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: xine.h.in,v 1.109 2003/12/09 23:55:11 hadess Exp $ + * $Id: xine.h.in,v 1.110 2003/12/10 00:54:25 hadess Exp $ * * public xine-lib (libxine) interface and documentation * @@ -793,8 +793,7 @@ int xine_get_audio_lang (xine_stream_t *stream, int channel, char *lang); int xine_get_spu_lang (xine_stream_t *stream, int channel, char *lang); -#define XINE_LANG_MAX 32 -#define XINE_LANG_LABEL_MAX_SIZE 128 +#define XINE_LANG_MAX 128 /* * get position / length information diff --git a/src/demuxers/demux_mng.c b/src/demuxers/demux_mng.c index f94babc8b..e1afda477 100644 --- a/src/demuxers/demux_mng.c +++ b/src/demuxers/demux_mng.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_mng.c,v 1.17 2003/12/05 15:54:57 f1rmb Exp $ + * $Id: demux_mng.c,v 1.18 2003/12/10 00:54:25 hadess Exp $ * * demux_mng.c, Demuxer plugin for Multiple-image Network Graphics format * @@ -28,6 +28,7 @@ #ifdef HAVE_CONFIG_H #include "config.h" +#undef HAVE_CONFIG_H #endif #include <stdio.h> @@ -35,6 +36,10 @@ #include <fcntl.h> #include <unistd.h> +#ifdef HAVE_STDLIB_H +#undef HAVE_STDLIB_H +#endif + #include <libmng.h> #define LOG_MODULE "demux_mng" diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c index fd68d0a89..59d410b9c 100644 --- a/src/demuxers/demux_ogg.c +++ b/src/demuxers/demux_ogg.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_ogg.c,v 1.123 2003/12/09 23:55:11 hadess Exp $ + * $Id: demux_ogg.c,v 1.124 2003/12/10 00:54:26 hadess Exp $ * * demultiplexer for ogg streams * @@ -1585,10 +1585,11 @@ static int demux_ogg_get_optional_data(demux_plugin_t *this_gen, for (stream_num=0; stream_num<this->num_streams; stream_num++) { if (this->buf_types[stream_num]==BUF_SPU_OGM+channel) { if (this->language[stream_num]) { - strncpy (str, this->language[stream_num], XINE_LANG_LABEL_MAX_SIZE); + strncpy (str, this->language[stream_num], XINE_LANG_MAX); + str[XINE_LANG_MAX - 1] = '\0'; return DEMUX_OPTIONAL_SUCCESS; } else { - snprintf(str, XINE_LANG_LABEL_MAX_SIZE, "channel %d",channel); + snprintf(str, XINE_LANG_MAX, "channel %d",channel); return DEMUX_OPTIONAL_SUCCESS; } } @@ -1604,10 +1605,11 @@ static int demux_ogg_get_optional_data(demux_plugin_t *this_gen, for (stream_num=0; stream_num<this->num_streams; stream_num++) { if ((this->buf_types[stream_num]&0xFF00001F)==BUF_AUDIO_BASE+channel) { if (this->language[stream_num]) { - strncpy (str, this->language[stream_num], XINE_LANG_LABEL_MAX_SIZE); + strncpy (str, this->language[stream_num], XINE_LANG_MAX); + str[XINE_LANG_MAX - 1] = '\0'; return DEMUX_OPTIONAL_SUCCESS; } else { - snprintf(str, XINE_LANG_LABEL_MAX_SIZE, "channel %d",channel); + snprintf(str, XINE_LANG_MAX, "channel %d",channel); return DEMUX_OPTIONAL_SUCCESS; } } |