claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix CppCheck warnings

Browse Source
This commit is contained in:
Erik de Castro Lopo
2019-07-14 10:02:07 +10:00
parent 1146117229
commit 48e8dbcf4a
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/share/utf8/charset_test.c
View File

@@ -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......"));

10
src/test_libFLAC++/metadata_manip.cpp
View File

@@ -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;

11
src/test_libFLAC/metadata_manip.c
View File

@@ -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;