[Commit] nickle/builtin file.c,1.10,1.11 sockets.c,1.9,1.10
Keith Packard
commit@keithp.com
Thu May 29 19:36:37 PDT 2003
- Previous message: [Commit] nickle file.c,1.48,1.49 lex.l,1.67,1.68 mem.h,1.10,1.11 sched.c,1.46,1.47 value.h,1.83,1.84
- Next message: [Commit] rrserver dispatch.5c,1.6,1.7 games.5c,1.4,1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: keithp
Update of /local/src/CVS/nickle/builtin
In directory home.keithp.com:/tmp/cvs-serv22790/builtin
Modified Files:
file.c sockets.c
Log Message:
Standard exception arguments were constructed backwards. Was attempting to use strerror; needed custom to handle EUTF8
Index: file.c
===================================================================
RCS file: /local/src/CVS/nickle/builtin/file.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- file.c 4 Nov 2002 09:45:41 -0000 1.10
+++ file.c 29 May 2003 18:36:35 -0000 1.11
@@ -122,7 +122,7 @@
if (file->file.flags & FileOutputError)
{
RaiseStandardException (exception_io_error,
- strerror (file->file.output_errno),
+ FileGetErrorMessage (file->file.output_errno),
2, FileGetError (file->file.output_errno), file);
}
}
@@ -145,7 +145,7 @@
if (!ret)
{
RaiseStandardException (exception_open_error,
- strerror (err),
+ FileGetErrorMessage (err),
2, FileGetError (err), name);
RETURN (Void);
}
@@ -162,7 +162,7 @@
break;
case FileError:
RaiseStandardException (exception_io_error,
- strerror (f->file.output_errno),
+ FileGetErrorMessage (f->file.output_errno),
2, FileGetError (f->file.output_errno), f);
break;
}
@@ -180,14 +180,14 @@
break;
case FileError:
RaiseStandardException (exception_io_error,
- strerror (f->file.output_errno),
+ FileGetErrorMessage (f->file.output_errno),
2, FileGetError (f->file.output_errno), f);
break;
default:
if (FileClose (f) == FileError)
{
RaiseStandardException (exception_io_error,
- strerror (f->file.output_errno),
+ FileGetErrorMessage (f->file.output_errno),
2, FileGetError (f->file.output_errno), f);
}
else
@@ -220,7 +220,7 @@
if (!ret)
{
RaiseStandardException (exception_open_error,
- strerror (err),
+ FileGetErrorMessage (err),
2, FileGetError (err), file);
ret = Void;
}
@@ -276,7 +276,7 @@
RETURN (Void);
case FileError:
RaiseStandardException (exception_io_error,
- strerror (f->file.input_errno),
+ FileGetErrorMessage (f->file.input_errno),
2, FileGetError (f->file.input_errno), f);
RETURN (Void);
default:
@@ -302,7 +302,7 @@
RETURN (Void);
case FileError:
RaiseStandardException (exception_io_error,
- strerror (f->file.input_errno),
+ FileGetErrorMessage (f->file.input_errno),
2, FileGetError (f->file.input_errno), f);
RETURN (Void);
default:
@@ -355,7 +355,7 @@
if (FileOutput (f, IntPart (v, "putb non integer")) == FileError)
{
RaiseStandardException (exception_io_error,
- strerror (f->file.output_errno),
+ FileGetErrorMessage (f->file.output_errno),
2, FileGetError (f->file.output_errno), f);
}
else
@@ -379,7 +379,7 @@
if (FileOutchar (f, IntPart (v, "putc non integer")) == FileError)
{
RaiseStandardException (exception_io_error,
- strerror (f->file.output_errno),
+ FileGetErrorMessage (f->file.output_errno),
2, FileGetError (f->file.output_errno), f);
}
else
Index: sockets.c
===================================================================
RCS file: /local/src/CVS/nickle/builtin/sockets.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- sockets.c 28 May 2003 22:12:41 -0000 1.9
+++ sockets.c 29 May 2003 18:36:35 -0000 1.10
@@ -20,7 +20,7 @@
#include "builtin.h"
#include <errno.h>
-#define perror(s) FilePrintf(FileStderr, s ": %s\n", strerror(errno))
+#define perror(s) FilePrintf(FileStderr, s ": %s\n", FileGetErrorMessage(errno))
#ifdef HAVE_HSTRERROR
#define herror(s) FilePrintf(FileStderr, s ": %s\n", hstrerror(h_errno))
#else
@@ -169,7 +169,7 @@
else
{
RaiseStandardException (exception_io_error,
- strerror (errno),
+ FileGetErrorMessage (errno),
2, FileGetError (errno),
s);
RETURN (Void); /* FIXME: more here? */
@@ -245,7 +245,7 @@
else
{
RaiseStandardException (exception_io_error,
- strerror (errno),
+ FileGetErrorMessage (errno),
2, FileGetError (errno),
s);
RETURN (Void);
- Previous message: [Commit] nickle file.c,1.48,1.49 lex.l,1.67,1.68 mem.h,1.10,1.11 sched.c,1.46,1.47 value.h,1.83,1.84
- Next message: [Commit] rrserver dispatch.5c,1.6,1.7 games.5c,1.4,1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Commit
mailing list