From 07d4f506899bfce60f37fadf851a67b83e66a75a Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 18 Nov 2014 02:35:35 -0500 Subject: [PATCH] Clean up funny code and initialize variables. --- libs/ardour/io.cc | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc index 333b0b1ea0..be626b3010 100644 --- a/libs/ardour/io.cc +++ b/libs/ardour/io.cc @@ -1098,7 +1098,6 @@ int IO::set_ports (const string& str) { vector ports; - int i; int n; uint32_t nports; @@ -1115,14 +1114,10 @@ IO::set_ports (const string& str) } } - string::size_type start, end, ostart; - - ostart = 0; - start = 0; - end = 0; - i = 0; - - while ((start = str.find_first_of ('{', ostart)) != string::npos) { + string::size_type start = 0; + string::size_type end = 0; + string::size_type ostart = 0; + for (int i = 0; (start = str.find_first_of ('{', ostart)) != string::npos; ++i) { start += 1; if ((end = str.find_first_of ('}', start)) == string::npos) { @@ -1143,7 +1138,6 @@ IO::set_ports (const string& str) } ostart = end+1; - i++; } return 0; -- 2.30.2