diff options
| author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2019-07-14 10:02:07 +1000 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2019-07-15 09:42:38 +1000 |
| commit | 48e8dbcf4ac89994d800c8a548b0195814ad6024 (patch) | |
| tree | 68c6aa7b32d92a28a5fc4a98deb23946a4ac3f0f | |
| parent | 11461172290a5110e30928295f3379d6e424d1d8 (diff) | |
| download | flac-48e8dbcf4ac89994d800c8a548b0195814ad6024.tar.gz | |
Fix CppCheck warnings
| -rw-r--r-- | src/share/utf8/charset_test.c | 2 | ||||
| -rw-r--r-- | src/test_libFLAC++/metadata_manip.cpp | 10 | ||||
| -rw-r--r-- | src/test_libFLAC/metadata_manip.c | 11 |
3 files changed, 14 insertions, 9 deletions
diff --git a/src/share/utf8/charset_test.c b/src/share/utf8/charset_test.c index 225a6731..6761100c 100644 --- a/src/share/utf8/charset_test.c +++ b/src/share/utf8/charset_test.c @@ -120,7 +120,7 @@ void test_utf8() /* Encoder */ safe_strncpy(s, ".......", sizeof(s)); - assert(charset_wctomb(charset, s, 1 << 31) == -1 && + assert(charset_wctomb(charset, s, 1u << 31) == -1 && !strcmp(s, ".......")); assert(charset_wctomb(charset, s, 127) == 1 && !strcmp(s, "\177......")); diff --git a/src/test_libFLAC++/metadata_manip.cpp b/src/test_libFLAC++/metadata_manip.cpp index a7aaf910..93b6e517 100644 --- a/src/test_libFLAC++/metadata_manip.cpp +++ b/src/test_libFLAC++/metadata_manip.cpp @@ -206,11 +206,13 @@ bool open_tempfile_(const char *filename, FILE **tempfile, char **tempfilename) static const char *tempfile_suffix = ".metadata_edit"; size_t destlen = strlen(filename) + strlen(tempfile_suffix) + 1; - if(0 == (*tempfilename = (char*)malloc(destlen))) + *tempfilename = (char*)malloc(destlen); + if (*tempfilename == 0) return false; flac_snprintf(*tempfilename, destlen, "%s%s", filename, tempfile_suffix); - if(0 == (*tempfile = flac_fopen(*tempfilename, "wb"))) + *tempfile = flac_fopen(*tempfilename, "wb"); + if (*tempfile == 0) return false; return true; @@ -218,12 +220,12 @@ bool open_tempfile_(const char *filename, FILE **tempfile, char **tempfilename) void cleanup_tempfile_(FILE **tempfile, char **tempfilename) { - if(0 != *tempfile) { + if (*tempfile != 0) { (void)fclose(*tempfile); *tempfile = 0; } - if(0 != *tempfilename) { + if (*tempfilename != 0) { (void)flac_unlink(*tempfilename); free(*tempfilename); *tempfilename = 0; diff --git a/src/test_libFLAC/metadata_manip.c b/src/test_libFLAC/metadata_manip.c index db9bd101..b4bf065e 100644 --- a/src/test_libFLAC/metadata_manip.c +++ b/src/test_libFLAC/metadata_manip.c @@ -189,12 +189,15 @@ static FLAC__bool open_tempfile_(const char *filename, FILE **tempfile, char **t { static const char *tempfile_suffix = ".metadata_edit"; size_t dest_len = strlen(filename) + strlen(tempfile_suffix) + 1; - if(0 == (*tempfilename = malloc(dest_len))) + + *tempfilename = malloc(dest_len); + if (*tempfilename == NULL) return false; safe_strncpy(*tempfilename, filename, dest_len); safe_strncat(*tempfilename, tempfile_suffix, dest_len); - if(0 == (*tempfile = flac_fopen(*tempfilename, "wb"))) + *tempfile = flac_fopen(*tempfilename, "wb"); + if (*tempfile == NULL) return false; return true; @@ -202,12 +205,12 @@ static FLAC__bool open_tempfile_(const char *filename, FILE **tempfile, char **t static void cleanup_tempfile_(FILE **tempfile, char **tempfilename) { - if(0 != *tempfile) { + if (*tempfile != NULL) { (void)fclose(*tempfile); *tempfile = 0; } - if(0 != *tempfilename) { + if (*tempfilename != NULL) { (void)flac_unlink(*tempfilename); free(*tempfilename); *tempfilename = 0; |