Cronocide/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2025-01-22 11:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some warnings on uninitialized MVE variables

Browse Source
This commit is contained in:
Azamat H. Hackimov 2024-09-04 14:26:33 +03:00
parent d185ab9514
commit 8d2935c32c
3 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libmve/mvelib.cpp
View File

@ -33,8 +33,8 @@ mve_cb_SetPalette mve_setpalette;
/* /*
* private utility functions * private utility functions
*/ */
static short _mve_get_short(unsigned char *data); static short _mve_get_short(const unsigned char *data);
static unsigned short _mve_get_ushort(unsigned char *data); static unsigned short _mve_get_ushort(const unsigned char *data);
/* /*
* private functions for mvefile * private functions for mvefile
@ -318,6 +318,8 @@ static void _mvefile_free(MVEFILE *movie) {
* open the file stream in thie object * open the file stream in thie object
*/ */
static int _mvefile_open(MVEFILE *file, void *stream) { static int _mvefile_open(MVEFILE *file, void *stream) {
if (!file)
return 0;
file->stream = stream; file->stream = stream;
if (!file->stream) if (!file->stream)
return 0; return 0;
@ -343,7 +345,7 @@ static int _mvefile_read_header(MVEFILE *movie) {
unsigned char buffer[26]; unsigned char buffer[26];
/* check the file is open */ /* check the file is open */
if (!movie->stream) if (!movie || !movie->stream)
return 0; return 0;
/* check the file is long enough */ /* check the file is long enough */
@ -351,7 +353,7 @@ static int _mvefile_read_header(MVEFILE *movie) {
return 0; return 0;
/* check the signature */ /* check the signature */
if (memcmp(buffer, MVE_HEADER, 20)) if (memcmp(buffer, MVE_HEADER, 20) != 0)
return 0; return 0;
/* check the hard-coded constants */ /* check the hard-coded constants */
@ -366,6 +368,9 @@ static int _mvefile_read_header(MVEFILE *movie) {
} }
static void _mvefile_set_buffer_size(MVEFILE *movie, int buf_size) { static void _mvefile_set_buffer_size(MVEFILE *movie, int buf_size) {
if (!movie)
return;
unsigned char *new_buffer; unsigned char *new_buffer;
int new_len; int new_len;
@ -384,7 +389,7 @@ static void _mvefile_set_buffer_size(MVEFILE *movie, int buf_size) {
/* free old buffer */ /* free old buffer */
if (movie->cur_chunk) { if (movie->cur_chunk) {
mve_free(movie->cur_chunk); mve_free(movie->cur_chunk);
movie->cur_chunk = 0; movie->cur_chunk = nullptr;
} }
/* install new buffer */ /* install new buffer */
@ -397,7 +402,7 @@ static int _mvefile_fetch_next_chunk(MVEFILE *movie) {
unsigned short length; unsigned short length;
/* fail if not open */ /* fail if not open */
if (!movie->stream) if (!movie || !movie->stream)
return 0; return 0;
/* fail if we can't read the next segment descriptor */ /* fail if we can't read the next segment descriptor */
@ -419,13 +424,13 @@ static int _mvefile_fetch_next_chunk(MVEFILE *movie) {
return 1; return 1;
} }
static short _mve_get_short(unsigned char *data) { static short _mve_get_short(const unsigned char *data) {
short value; short value;
value = data[0] | (data[1] << 8); value = data[0] | (data[1] << 8);
return value; return value;
} }
static unsigned short _mve_get_ushort(unsigned char *data) { static unsigned short _mve_get_ushort(const unsigned char *data) {
unsigned short value; unsigned short value;
value = data[0] | (data[1] << 8); value = data[0] | (data[1] << 8);
return value; return value;
@ -440,7 +445,7 @@ static MVESTREAM *_mvestream_alloc() {
/* allocate and zero-initialize everything */ /* allocate and zero-initialize everything */
movie = (MVESTREAM *)mve_alloc(sizeof(MVESTREAM)); movie = (MVESTREAM *)mve_alloc(sizeof(MVESTREAM));
movie->movie = nullptr; movie->movie = nullptr;
movie->context = 0; movie->context = nullptr;
memset(movie->handlers, 0, sizeof(movie->handlers)); memset(movie->handlers, 0, sizeof(movie->handlers));
return movie; return movie;
@ -469,6 +474,8 @@ static void _mvestream_free(MVESTREAM *movie) {
* open an MVESTREAM object * open an MVESTREAM object
*/ */
static int _mvestream_open(MVESTREAM *movie, void *stream) { static int _mvestream_open(MVESTREAM *movie, void *stream) {
if (!movie)
return 0;
movie->movie = mvefile_open(stream); movie->movie = mvefile_open(stream);
return (movie->movie == nullptr) ? 0 : 1; return (movie->movie == nullptr) ? 0 : 1;

4
libmve/mvelib.h
View File

@ -23,7 +23,7 @@
/* callback for reading stream */ /* callback for reading stream */
typedef unsigned int (*mve_cb_Read)(void *stream, void *buffer, unsigned int count); typedef unsigned int (*mve_cb_Read)(void *stream, void *buffer, unsigned int count);
/* callback for memore allocating */ /* callback for memory allocating */
typedef void *(*mve_cb_Alloc)(unsigned int size); typedef void *(*mve_cb_Alloc)(unsigned int size);
/* callback for memory freeing */ /* callback for memory freeing */
typedef void (*mve_cb_Free)(void *ptr); typedef void (*mve_cb_Free)(void *ptr);
@ -76,7 +76,7 @@ void MVE_rmEndMovie(MVESTREAM *mve);
void MVE_getVideoSpec(MVE_videoSpec *vSpec); void MVE_getVideoSpec(MVE_videoSpec *vSpec);
// Initialize MVE sound. Set `enable` to false if sound should not be enabled. // Initialize MVE sound. Set `enable` to false if sound should not be enabled.
void MVE_sndInit(const bool enable); void MVE_sndInit(bool enable);
void MVE_ioCallbacks(mve_cb_Read io_read); void MVE_ioCallbacks(mve_cb_Read io_read);
void MVE_memCallbacks(mve_cb_Alloc mem_alloc, mve_cb_Free mem_free); void MVE_memCallbacks(mve_cb_Alloc mem_alloc, mve_cb_Free mem_free);

2
libmve/mveplay.cpp
View File

@ -470,7 +470,7 @@ void MVE_rmEndMovie(MVESTREAM *mve) {
void MVE_rmHoldMovie() { timer_started = 0; } void MVE_rmHoldMovie() { timer_started = 0; }
void MVE_sndInit(const bool enable) { void MVE_sndInit(bool enable) {
#ifdef AUDIO #ifdef AUDIO
if (enable) { if (enable) {
mve_audio_enabled = 1; mve_audio_enabled = 1;