Changes in libcfa/src/iostream.cfa [2fa0237:0f107e4]

File:

• libcfa/src/iostream.cfa (modified) (3 diffs)

libcfa/src/iostream.cfa

@@ -1 @@
-
 //
 // Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
@@ -977 +976 @@
                 if ( f.flags.ignore ) { fmtstr[1] = '*'; start += 1; }
                 // no maximum width necessary because text ignored => width is read width
-                if ( f.wd != -1 ) {
-                        // wd is buffer bytes available (for input chars + null terminator)
-                        // rwd is count of input chars
-                        int rwd = f.flags.rwd ? f.wd : (f.wd - 1);
-                        start += sprintf( &fmtstr[start], "%d", rwd );
-                }
+                if ( f.wd != -1 ) { start += sprintf( &fmtstr[start], "%d", f.wd ); }
 
                 if ( ! scanset ) {
@@ -999 +993 @@
                 } // if
 
-                int check = f.wd - 2;
+                int check = f.wd - 1;
                 if ( ! f.flags.rwd ) f.s[check] = '\0';                 // insert sentinel
                 len = fmt( is, fmtstr, f.s );