From 881d77f1e5a905009b61444670e9ec1a2aaa71ec Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 18 Nov 2014 02:34:18 -0500 Subject: [PATCH] Constrain variable scopen and avoid uninitialized values existing at all. Note: dead assignments trigger scan-build dead code warnings, which initializations do not. --- libs/ardour/rb_effect.cc | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libs/ardour/rb_effect.cc b/libs/ardour/rb_effect.cc index 804b79f87d..2749e18258 100644 --- a/libs/ardour/rb_effect.cc +++ b/libs/ardour/rb_effect.cc @@ -72,7 +72,6 @@ RBEffect::run (boost::shared_ptr r, Progress* progress) } SourceList nsrcs; - framecnt_t done; int ret = -1; const framecnt_t bufsize = 256; gain_t* gain_buffer = 0; @@ -80,8 +79,6 @@ RBEffect::run (boost::shared_ptr r, Progress* progress) char suffix[32]; string new_name; string::size_type at; - framepos_t pos = 0; - framecnt_t avail = 0; boost::shared_ptr result; cerr << "RBEffect: source region: position = " << region->position() @@ -184,6 +181,10 @@ RBEffect::run (boost::shared_ptr r, Progress* progress) /* create new sources */ + framepos_t pos = 0; + framecnt_t avail = 0; + framecnt_t done = 0; + if (make_new_sources (region, nsrcs, suffix)) { goto out; } @@ -201,10 +202,6 @@ RBEffect::run (boost::shared_ptr r, Progress* progress) /* study first, process afterwards. */ - pos = 0; - avail = 0; - done = 0; - try { while (pos < read_duration && !tsr.cancel) {