[CinCV-commits] CinelerraCV.git (#1211) - master (branch) updated: v2.1.5-168-gb64ad0b

git version control git at cinelerra-cv.org
Sat Jun 21 13:46:28 CEST 2014


The branch, master has been updated
       via  b64ad0b20d253db6f27cf83cb78aa736b3185321 (commit)
       via  c2962cf562c6de79728bbe82ef8cecaece139634 (commit)
      from  0dc2be98a530abf7e012123902e75a25a26aee85 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b64ad0b20d253db6f27cf83cb78aa736b3185321
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Fri Jun 20 23:47:13 2014 +0200

    Add missing return values for a few functions.
    
    Keeping 'int' as return type to stay API compatible with Cinelerra HV 4.5,
    instead of changing it to 'void'.
    
    Fixes Coverity CID 68298, 68297, 63727 and 63726.

commit c2962cf562c6de79728bbe82ef8cecaece139634
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sat Jun 21 13:45:14 2014 +0200

    Avoid useless compare between NULL and an array in Pipe::open()
    
    In the Pipe class, the complete member variable is a array of
    characters, not a pointer.  In Pipe::open(), the array is compared with
    NULL, which will always be false.  Drop the useless test.
    
    Fixes Coverity CID 68299

-----------------------------------------------------------------------

Summary of changes:
 cinelerra/edits.C       |    1 +
 cinelerra/mainmenu.C    |    2 ++
 cinelerra/menueffects.C |    1 +
 cinelerra/pipe.C        |    2 +-
 4 files changed, 5 insertions(+), 1 deletions(-)

The diff of changes is:
diff --git a/cinelerra/edits.C b/cinelerra/edits.C
index 3a25266..89c7c07 100644
--- a/cinelerra/edits.C
+++ b/cinelerra/edits.C
@@ -659,6 +659,7 @@ int Edits::copy(int64_t start, int64_t end, FileXML *file, const char *output_pa
 	file->tag.set_title("/EDITS");
 	file->append_tag();
 	file->append_newline();
+	return 0;
 }
 
 
diff --git a/cinelerra/mainmenu.C b/cinelerra/mainmenu.C
index 525519d..43fd3b1 100644
--- a/cinelerra/mainmenu.C
+++ b/cinelerra/mainmenu.C
@@ -554,6 +554,7 @@ int Undo::update_caption(const char *new_caption)
 	char string[1024];
 	sprintf(string, _("Undo %s"), new_caption);
 	set_text(string);
+	return 0;
 }
 
 
@@ -574,6 +575,7 @@ int Redo::update_caption(const char *new_caption)
 	char string[1024];
 	sprintf(string, _("Redo %s"), new_caption);
 	set_text(string);
+	return 0;
 }
 
 CutKeyframes::CutKeyframes(MWindow *mwindow)
diff --git a/cinelerra/menueffects.C b/cinelerra/menueffects.C
index 9e9d77c..9e8f6cb 100644
--- a/cinelerra/menueffects.C
+++ b/cinelerra/menueffects.C
@@ -106,6 +106,7 @@ MenuEffectThread::~MenuEffectThread()
 int MenuEffectThread::set_title(const char *title)
 {
 	strcpy(this->title, title);
+	return 0;
 }
 
 // for recent effect menu items and running new effects
diff --git a/cinelerra/pipe.C b/cinelerra/pipe.C
index bb0db86..87b8199 100644
--- a/cinelerra/pipe.C
+++ b/cinelerra/pipe.C
@@ -124,7 +124,7 @@ int Pipe::open(const char *mode)
 	if (substitute() < 0) 
 		return 1;
 
-	if (complete == NULL || strlen(complete) == 0) 
+	if (strlen(complete) == 0) 
 	{
 		printf("Pipe::open(): no pipe to open\n");
 		return 1;


hooks/post-receive
-- 
CinelerraCV.git (CinelerraCV)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CinelerraCV.git" (CinelerraCV).



More information about the cinelerra-commits mailing list