Changeset 998

Timestamp:

07/11/20 13:47:06 (4 years ago)

Author:

Maciej Komosinski

Message:

Report the error status just once so that while(go()) does not have to always check the error condition to stop (prevents endless loop on permanent errors)

Location:

cpp/frams/param

Files:

• multiparamload.cpp (modified) (2 diffs)
• multiparamload.h (modified) (1 diff)

cpp/frams/param/multiparamload.cpp

@@ -93 +93 @@
 {
         SString buf;
-        if (status == OnError) return status;
+        if (status == OnError) return getStatusClearError();
         int unexpected_line = 0;
         while (!finished())
@@ -202 +202 @@
                 }
         }
-        return status;
+        return getStatusClearError();
 }
 

cpp/frams/param/multiparamload.h

@@ -90 +90 @@
         /** same value as 'go()' */
         int getStatus() { return status; }
+        int getStatusClearError() { int s = status; if (status & OnError) status &= ~ OnError; return s; }
         int finished() { return (status == Finished); }