changeset 3627:58e52fbee1dd

[project @ 2000-03-23 07:25:29 by jwe]
author jwe
date Thu, 23 Mar 2000 07:25:30 +0000
parents 65fa96da2ed2
children 168c4d71dc63
files src/ChangeLog src/oct-stream.cc
diffstat 2 files changed, 12 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Thu Mar 23 07:21:24 2000 +0000
+++ b/src/ChangeLog	Thu Mar 23 07:25:30 2000 +0000
@@ -1,3 +1,8 @@
+2000-03-23  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* oct-stream.cc (octave_base_stream::printf): Use octave_format
+	instead of ostream::form.  Return number of characters written.
+
 2000-03-22  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* oct-stream.cc (do_printf_conv): Use octave_format instead of
--- a/src/oct-stream.cc	Thu Mar 23 07:21:24 2000 +0000
+++ b/src/oct-stream.cc	Thu Mar 23 07:25:30 2000 +0000
@@ -2306,12 +2306,13 @@
 
 	    if (elt)
 	      {
-		os.form (elt->text);
-
-		if (os)
-		  retval = 0;
-		else
-		  error ("fprintf: write error");
+		retval = octave_format (os, elt->text);
+
+		if (! os)
+		  {
+		    retval = -1;
+		    error ("fprintf: write error");
+		  }
 	      }
 	  }
 	  break;