diff options
| author | Torbjörn Andersson | 2010-01-03 19:37:43 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2010-01-03 19:37:43 +0000 |
| commit | 72eb9ec9eab5efcb3aa99a962a80423e8c0a3232 (patch) | |
| tree | 032c9107838aefca6a166465a46fa7318bb82566 /backends/midi | |
| parent | 910ffb53a0b6c74a965df9a1270cdfc3885252ec (diff) | |
| download | scummvm-rg350-72eb9ec9eab5efcb3aa99a962a80423e8c0a3232.tar.gz scummvm-rg350-72eb9ec9eab5efcb3aa99a962a80423e8c0a3232.tar.bz2 scummvm-rg350-72eb9ec9eab5efcb3aa99a962a80423e8c0a3232.zip | |
Fixed a bunch of cppcheck warnings. Mostly about checking if a pointer is null
before freeing it, which isn't necessary.
svn-id: r46941
Diffstat (limited to 'backends/midi')
| -rw-r--r-- | backends/midi/timidity.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/backends/midi/timidity.cpp b/backends/midi/timidity.cpp index 584518d736..36d437414f 100644 --- a/backends/midi/timidity.cpp +++ b/backends/midi/timidity.cpp @@ -320,13 +320,12 @@ int MidiDriver_TIMIDITY::connect_to_server(const char* hostname, unsigned short char *MidiDriver_TIMIDITY::timidity_ctl_command(const char *fmt, ...) { /* XXX: I don't like this static buffer!!! */ static char buff[BUFSIZ]; - int status, len; va_list ap; if (fmt != NULL) { /* if argumends are present, write them to control connection */ va_start(ap, fmt); - len = vsnprintf(buff, BUFSIZ-1, fmt, ap); /* leave one byte for \n */ + int len = vsnprintf(buff, BUFSIZ-1, fmt, ap); /* leave one byte for \n */ va_end(ap); /* add newline if needed */ @@ -345,7 +344,7 @@ char *MidiDriver_TIMIDITY::timidity_ctl_command(const char *fmt, ...) { } /* report errors from server */ - status = atoi(buff); + int status = atoi(buff); if (400 <= status && status <= 499) { /* Error of data stream */ warning("TiMidity: error from server: %s", buff); continue; |