Changeset 300 for cpp/frams/param/param.cpp

Timestamp:

01/17/15 04:15:17 (9 years ago)

Author:

Maciej Komosinski

Message:

• don't assume getPropCount() is constant while iterating
• getMinMax() strips trailing space from default string, as specified in f0 formatspec

File:

• cpp/frams/param/param.cpp (modified) (4 diffs)

cpp/frams/param/param.cpp

@@ -102 +102 @@
                 if (*t)
                         {
-                        const char* til=strchr(t,'~');
-                        if (!til)
-                                def=SString(t);
-                        else
-                                {
-                                while ((til>t)&&(til[-1]==' ')) til--;
-                                def=SString(t,til-t);
-                                }
+                        const char* end=strchr(t,'~');
+                        if (!end)
+                                end=t+strlen(t);
+                        while ((end>t)&&(end[-1]==' ')) end--;
+                        def=SString(t,end-t);
                         }
                 return 3;
@@ -119 +116 @@
 void ParamInterface::setDefault()
 {
-        int n = getPropCount();
-        for (int i = 0; i < n; i++)
+        for (int i = 0; i < getPropCount(); i++)
                 setDefault(i);
 }
@@ -126 +122 @@
 void ParamInterface::setMin()
 {
-        int n = getPropCount();
-        for (int i = 0; i < n; i++)
+        for (int i = 0; i < getPropCount(); i++)
                 setMin(i);
 }
@@ -133 +128 @@
 void ParamInterface::setMax()
 {
-        int n = getPropCount();
-        for (int i = 0; i < n; i++)
+        for (int i = 0; i < getPropCount(); i++)
                 setMax(i);
 }