octave: src/file-io.cc comparison

comparison src/file-io.cc @ 4233:ccfdb55c8156

[project @ 2002-12-20 22:43:54 by jwe]

author	jwe
date	Fri, 20 Dec 2002 22:43:55 +0000
parents	cbac6756967e
children	df5f2e433a11

comparison

equal deleted inserted replaced

-:b032ebd54586
+:ccfdb55c8156
 Closes the specified file.  If an error is encountered while trying to\n\
 close the file, an error message is printed and @code{fclose} returns\n\
 0.  Otherwise, it returns 1.\n\
 @end deftypefn")
 {
-double retval = -1.0;
+octave_value retval = -1;
 int nargin = args.length ();
 if (nargin == 1)
-retval = static_cast<double> (octave_stream_list::remove (args(0),
+retval = octave_stream_list::remove (args(0), "fclose");
-				  "fclose"));
 else
 print_usage ("fclose");
 return retval;
 }
 pending output makes it to the screen before some other event occurs.\n\
 For example, it is always a good idea to flush the standard output\n\
 stream before calling @code{input}.\n\
 @end deftypefn")
 {
-double retval = -1.0;
+octave_value retval = -1;
 int nargin = args.length ();
 if (nargin == 1)
 {
 if (fid == 1)
 	{
 	  flush_octave_stdout ();
-	  retval = 0.0;
+	  retval = 0;
 	}
 else
 	{
 	  octave_stream os = octave_stream_list::lookup (fid, "fflush");
 	  if (! error_state)
-	    retval = static_cast<double> (os.flush ());
+	    retval = os.flush ();
 	}
 }
 else
 print_usage ("fflush");
 If there are no more characters to read, @code{fgetl} returns @minus{}1.\n\
 @end deftypefn")
 {
 octave_value_list retval;
-retval(1) = 0.0;
+retval(1) = 0;
-retval(0) = -1.0;
+retval(0) = -1;
 int nargin = args.length ();
 if (nargin == 1 || nargin == 2)
 {
 octave_stream os = octave_stream_list::lookup (args(0), "fgetl");
 if (! error_state)
 	{
 	  octave_value len_arg = (nargin == 2)
-	    ? args(1) : octave_value (static_cast<double> (INT_MAX));
+	    ? args(1) : octave_value (INT_MAX);
 	  bool err = false;
 	  std::string tmp = os.getl (len_arg, err);
 octave_stream os = octave_stream_list::lookup (args(0), "fgets");
 if (! error_state)
 	{
 	  octave_value len_arg = (nargin == 2)
-	    ? args(1) : octave_value (static_cast<double> (INT_MAX));
+	    ? args(1) : octave_value (INT_MAX);
 	  bool err = false;
 	  std::string tmp = os.gets (len_arg, err);
 Move the file pointer to the beginning of the file @var{fid}, returning\n\
 1 for success, and 0 if an error was encountered.  It is equivalent to\n\
 @code{fseek (@var{fid}, 0, SEEK_SET)}.\n\
 @end deftypefn")
 {
-double retval = -1.0;
+octave_value retval = -1;
 int nargin = args.length ();
 if (nargin == 1)
 {
 octave_stream os = octave_stream_list::lookup (args(0), "frewind");
 if (! error_state)
-	retval = static_cast<double> (os.rewind ());
+	retval = os.rewind ();
 }
 else
 print_usage ("frewind");
 return retval;
 file). If @var{origin} is omitted, @code{SEEK_SET} is assumed.  The\n\
 offset must be zero, or a value returned by @code{ftell} (in which case\n\
 @var{origin} must be @code{SEEK_SET}.\n\
 @end deftypefn")
 {
-double retval = -1.0;
+octave_value retval = -1;
 int nargin = args.length ();
 if (nargin == 2 || nargin == 3)
 {
 if (! error_state)
 	{
 	  octave_value origin_arg = (nargin == 3)
 	    ? args(2) : octave_value (-1.0);
-	  retval = static_cast<double> (os.seek (args(1), origin_arg));
+	  retval = os.seek (args(1), origin_arg);
 	}
 }
 else
 print_usage ("fseek");
 @deftypefn {Built-in Function} {} ftell (@var{fid})\n\
 Return the position of the file pointer as the number of characters\n\
 from the beginning of the file @var{fid}.\n\
 @end deftypefn")
 {
-double retval = -1.0;
+octave_value retval = -1;
 int nargin = args.length ();
 if (nargin == 1)
 {
 @deftypefn {Built-in Function} {} fprintf (@var{fid}, @var{template}, @dots{})\n\
 This function is just like @code{printf}, except that the output is\n\
 written to the stream @var{fid} instead of @code{stdout}.\n\
 @end deftypefn")
 {
-double retval = -1.0;
+octave_value retval = -1;
 bool return_char_count = true;
 int nargin = args.length ();
 if (nargin > 1 || (nargin > 0 && args(0).is_string ()))
 "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} fputs (@var{fid}, @var{string})\n\
 Write a string to a file with no formatting.\n\
 @end deftypefn")
 {
-double retval = -1.0;
+octave_value retval = -1;
 int nargin = args.length ();
 if (nargin == 2)
 {
 		  for (int i = 1; i < nargin; i++)
 		    tmp_args(i-1) = args(i);
 		}
-	      retval(2) = static_cast<double> (os.printf (fmt, tmp_args));
+	      retval(2) = os.printf (fmt, tmp_args);
 	      retval(1) = os.error ();
 	      retval(0) = ostr->str ();
 	    }
 	  else
 	    ::error ("sprintf: format must be a string");
 		  if (! error_state)
 		    {
 		      octave_value tmp = os.scanf (fmt, size, count);
-		      retval(1) = static_cast<double> (count);
+		      retval(1) = count;
 		      retval(0) = tmp;
 		    }
 		}
 	      else
 		::error ("fscanf: format must be a string");
 		      // position will clear it.
 		      std::string errmsg = os.error ();
 		      retval(3) = static_cast<double> (os.tell () + 1);
 		      retval(2) = errmsg;
-		      retval(1) = static_cast<double> (count);
+		      retval(1) = count;
 		      retval(0) = tmp;
 		    }
 		  else
 		    ::error ("sscanf: format must be a string");
 		}
 	  int count = -1;
 	  octave_value tmp = do_fread (os, size, prec, skip, arch, count);
-	  retval(1) = static_cast<double> (count);
+	  retval(1) = count;
 	  retval(0) = tmp;
 	}
 }
 else
 print_usage ("fread");
 \n\
 The behavior of @code{fwrite} is undefined if the values in @var{data}\n\
 are too large to fit in the specified precision.\n\
 @end deftypefn")
 {
-octave_value retval = -1.0;
+octave_value retval = -1;
 int nargin = args.length ();
 if (nargin > 1 && nargin < 6)
 {
 file and 0 otherwise.  Note that it will only return 1 if the end of the\n\
 file has already been encountered, not if the next read operation will\n\
 result in an end-of-file condition.\n\
 @end deftypefn")
 {
-double retval = -1.0;
+octave_value retval = -1;
 int nargin = args.length ();
 if (nargin == 1)
 {
 	  int error_number = 0;
 	  std::string error_message = os.error (clear, error_number);
-	  retval(1) = static_cast<double> (error_number);
+	  retval(1) = error_number;
 	  retval(0) = error_message;
 	}
 }
 else
 print_usage ("ferror");
 @print{} drwxrwxrwt  15 root  root  2048 Feb 17 14:53 tmp\n\
 @end group\n\
 @end example\n\
 @end deftypefn")
 {
-octave_value retval = -1.0;
+octave_value retval = -1;
 int nargin = args.length ();
 if (nargin == 2)
 {
 @deftypefn {Built-in Function} {} pclose (@var{fid})\n\
 Close a file identifier that was opened by @code{popen}.  You may also\n\
 use @code{fclose} for the same purpose.\n\
 @end deftypefn")
 {
-double retval = -1.0;
+octave_value retval = -1;
 int nargin = args.length ();
 if (nargin == 1)
-retval = static_cast<double> (octave_stream_list::remove (args(0),
+retval = octave_stream_list::remove (args(0), "pclose");
-				  "pclose"));
 else
 print_usage ("pclose");
 return retval;
 }
 }
 else
 print_usage ("umask");
 if (status >= 0)
-retval(0) = static_cast<double> (status);
+retval(0) = status;
 return retval;
 }
 void
 symbols_of_file_io (void)
 {
 // NOTE: the values of SEEK_SET, SEEK_CUR, and SEEK_END have to be
 // this way for Matlab compatibility.
-DEFCONSTX ("SEEK_SET", SBV_SEEK_SET, -1.0,
+DEFCONSTX ("SEEK_SET", SBV_SEEK_SET, -1,
 "-*- texinfo -*-\n\
 @defvr {Built-in Variable} SEEK_SET\n\
 @defvrx {Built-in Variable} SEEK_CUR\n\
 @defvrx {Built-in Variable} SEEK_END\n\
 These variables may be used as the optional third argument for the\n\
 @item SEEK_END\n\
 used with fseek to position file relative to the end.\n\
 @end table\n\
 @end defvr");
-DEFCONSTX ("SEEK_CUR", SBV_SEEK_CUR, 0.0,
+DEFCONSTX ("SEEK_CUR", SBV_SEEK_CUR, 0,
 "-*- texinfo -*-\n\
 @defvr {Built-in Variable} SEEK_CUR\n\
 See SEEK_SET.\n\
 @end defvr");
-DEFCONSTX ("SEEK_END", SBV_SEEK_END, 1.0,
+DEFCONSTX ("SEEK_END", SBV_SEEK_END, 1,
 "-*- texinfo -*-\n\
 @defvr {Built-in Variable} SEEK_END\n\
 See SEEK_SET.\n\
 @end defvr");

Mercurial > octave

comparison src/file-io.cc @ 4233:ccfdb55c8156