diff --git a/library/mount_fstatfs.c b/library/mount_fstatfs.c
index 3b89237..d731520 100644
--- a/library/mount_fstatfs.c
+++ b/library/mount_fstatfs.c
@@ -1,5 +1,5 @@
 /*
- * $Id: mount_fstatfs.c,v 1.5 2005-02-18 18:53:16 obarthel Exp $
+ * $Id: mount_fstatfs.c,v 1.6 2005-02-21 10:21:42 obarthel Exp $
  *
  * :ts=4
  *
@@ -121,7 +121,7 @@ fstatfs(int file_descriptor, struct statfs *buf)
 
 	__convert_info_to_statfs(id,buf);
 
-	result = OK;
+	result = 0;
 
  out:
 
diff --git a/library/sas_profile.c b/library/sas_profile.c
index 9e9e018..b931955 100644
--- a/library/sas_profile.c
+++ b/library/sas_profile.c
@@ -1,5 +1,5 @@
 /*
- * $Id: sas_profile.c,v 1.1.1.1 2004-07-26 16:31:04 obarthel Exp $
+ * $Id: sas_profile.c,v 1.2 2005-02-21 10:21:43 obarthel Exp $
  *
  * :ts=4
  *
@@ -133,7 +133,7 @@ send_profiler_message(ULONG clock_value,char * id,ULONG flags)
 	PutMsg(profiler_port,(struct Message *)spm);
 	WaitPort(reply_port);
 
-	result = OK;
+	result = 0;
 
  out:
 
diff --git a/library/socket_ioctl.c b/library/socket_ioctl.c
index f3af8a1..3312205 100644
--- a/library/socket_ioctl.c
+++ b/library/socket_ioctl.c
@@ -1,5 +1,5 @@
 /*
- * $Id: socket_ioctl.c,v 1.5 2005-02-18 18:53:16 obarthel Exp $
+ * $Id: socket_ioctl.c,v 1.6 2005-02-21 10:21:43 obarthel Exp $
  *
  * :ts=4
  *
@@ -85,7 +85,7 @@ ioctl(int sockfd,unsigned long request, ... /* char *arg */)
 	result = __IoctlSocket((LONG)fd->fd_DefaultFile,request,param);
 	PROFILE_ON();
 
-	if(result == OK)
+	if(result == 0)
 	{
 		int * option = (int *)param;
 
diff --git a/library/stat_fchmod.c b/library/stat_fchmod.c
index 26711f2..212ab54 100644
--- a/library/stat_fchmod.c
+++ b/library/stat_fchmod.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stat_fchmod.c,v 1.5 2005-02-18 18:53:16 obarthel Exp $
+ * $Id: stat_fchmod.c,v 1.6 2005-02-21 10:21:44 obarthel Exp $
  *
  * :ts=4
  *
@@ -155,7 +155,7 @@ fchmod(int file_descriptor, mode_t mode)
 		goto out;
 	}
 
-	result = OK;
+	result = 0;
 
  out:
 
diff --git a/library/stdio_dropiobreadbuffer.c b/library/stdio_dropiobreadbuffer.c
index 47853e2..eb150f4 100644
--- a/library/stdio_dropiobreadbuffer.c
+++ b/library/stdio_dropiobreadbuffer.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_dropiobreadbuffer.c,v 1.5 2005-02-20 15:46:52 obarthel Exp $
+ * $Id: stdio_dropiobreadbuffer.c,v 1.6 2005-02-21 10:21:44 obarthel Exp $
  *
  * :ts=4
  *
@@ -87,10 +87,10 @@ __drop_iob_read_buffer(struct iob * file)
 				{
 					SHOWMSG("that didn't work");
 
-					SET_FLAG(file->iob_Flags,IOBF_ERROR);
-
 					result = -1;
 
+					SET_FLAG(file->iob_Flags,IOBF_ERROR);
+
 					__set_errno(fam.fam_Error);
 
 					goto out;
diff --git a/library/stdio_fclose.c b/library/stdio_fclose.c
index 49c720b..cdd3336 100644
--- a/library/stdio_fclose.c
+++ b/library/stdio_fclose.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_fclose.c,v 1.4 2005-02-20 13:19:40 obarthel Exp $
+ * $Id: stdio_fclose.c,v 1.5 2005-02-21 10:21:44 obarthel Exp $
  *
  * :ts=4
  *
@@ -54,7 +54,7 @@ fclose(FILE *stream)
 {
 	struct iob * file = (struct iob *)stream;
 	struct file_action_message fam;
-	int result = OK;
+	int result = 0;
 
 	ENTER();
 
diff --git a/library/stdio_fdhookentry.c b/library/stdio_fdhookentry.c
index 938d134..134bea5 100644
--- a/library/stdio_fdhookentry.c
+++ b/library/stdio_fdhookentry.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_fdhookentry.c,v 1.13 2005-02-20 15:46:52 obarthel Exp $
+ * $Id: stdio_fdhookentry.c,v 1.14 2005-02-21 10:21:45 obarthel Exp $
  *
  * :ts=4
  *
@@ -440,7 +440,7 @@ __fd_hook_entry(
 							break;
 						}
 
-						if(__grow_file_size(fd,new_position - fib->fib_Size) != OK)
+						if(__grow_file_size(fd,new_position - fib->fib_Size) < 0)
 						{
 							fam->fam_Error = __translate_io_error_to_errno(IoErr());
 							break;
diff --git a/library/stdio_fflush.c b/library/stdio_fflush.c
index 0d2aab5..a58777b 100644
--- a/library/stdio_fflush.c
+++ b/library/stdio_fflush.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_fflush.c,v 1.3 2005-02-03 16:56:16 obarthel Exp $
+ * $Id: stdio_fflush.c,v 1.4 2005-02-21 10:21:48 obarthel Exp $
  *
  * :ts=4
  *
@@ -110,7 +110,7 @@ fflush(FILE *stream)
 	}
 	#endif /* UNIX_PATH_SEMANTICS */
 
-	result = OK;
+	result = 0;
 
  out:
 
diff --git a/library/stdio_fgetc.c b/library/stdio_fgetc.c
index 03ed732..bb471a0 100644
--- a/library/stdio_fgetc.c
+++ b/library/stdio_fgetc.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_fgetc.c,v 1.3 2005-02-03 16:56:16 obarthel Exp $
+ * $Id: stdio_fgetc.c,v 1.4 2005-02-21 10:21:48 obarthel Exp $
  *
  * :ts=4
  *
@@ -81,7 +81,7 @@ int
 __fgetc_check(FILE * stream)
 {
 	struct iob * file = (struct iob *)stream;
-	int result = EOF;
+	int result = -1;
 
 	assert( stream != NULL );
 
@@ -148,7 +148,7 @@ fgetc(FILE *stream)
 	}
 	#endif /* CHECK_FOR_NULL_POINTERS */
 
-	if(__fgetc_check(stream) != OK)
+	if(__fgetc_check(stream) < 0)
 		goto out;
 
 	result = __getc(stream);
diff --git a/library/stdio_fgets.c b/library/stdio_fgets.c
index eebabb8..101de7b 100644
--- a/library/stdio_fgets.c
+++ b/library/stdio_fgets.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_fgets.c,v 1.3 2005-02-03 16:56:16 obarthel Exp $
+ * $Id: stdio_fgets.c,v 1.4 2005-02-21 10:21:48 obarthel Exp $
  *
  * :ts=4
  *
@@ -84,7 +84,7 @@ fgets(char *s,int n,FILE *stream)
 	/* Take care of the checks and data structure changes that
 	 * need to be handled only once for this stream.
 	 */
-	if(__fgetc_check(stream) != OK)
+	if(__fgetc_check(stream) < 0)
 	{
 		result = NULL;
 		goto out;
diff --git a/library/stdio_filliobreadbuffer.c b/library/stdio_filliobreadbuffer.c
index 0dfbad4..155a7bb 100644
--- a/library/stdio_filliobreadbuffer.c
+++ b/library/stdio_filliobreadbuffer.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_filliobreadbuffer.c,v 1.6 2005-02-20 15:46:52 obarthel Exp $
+ * $Id: stdio_filliobreadbuffer.c,v 1.7 2005-02-21 10:21:48 obarthel Exp $
  *
  * :ts=4
  *
@@ -89,11 +89,12 @@ __fill_iob_read_buffer(struct iob * file)
 	num_bytes_read = (*file->iob_Action)(file,&fam);
 	if(num_bytes_read < 0)
 	{
-		SET_FLAG(file->iob_Flags,IOBF_ERROR);
-
 		D(("got error %ld",fam.fam_Error));
 
+		SET_FLAG(file->iob_Flags,IOBF_ERROR);
+
 		__set_errno(fam.fam_Error);
+
 		goto out;
 	}
 
diff --git a/library/stdio_flushiobwritebuffer.c b/library/stdio_flushiobwritebuffer.c
index f37b15e..6f9ad38 100644
--- a/library/stdio_flushiobwritebuffer.c
+++ b/library/stdio_flushiobwritebuffer.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_flushiobwritebuffer.c,v 1.5 2005-02-20 15:46:52 obarthel Exp $
+ * $Id: stdio_flushiobwritebuffer.c,v 1.6 2005-02-21 10:21:48 obarthel Exp $
  *
  * :ts=4
  *
@@ -84,6 +84,7 @@ __flush_iob_write_buffer(struct iob * file)
 			SET_FLAG(file->iob_Flags,IOBF_ERROR);
 
 			__set_errno(fam.fam_Error);
+
 			goto out;
 		}
 
diff --git a/library/stdio_fputc.c b/library/stdio_fputc.c
index cc860ac..d6a5537 100644
--- a/library/stdio_fputc.c
+++ b/library/stdio_fputc.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_fputc.c,v 1.3 2005-02-03 16:56:16 obarthel Exp $
+ * $Id: stdio_fputc.c,v 1.4 2005-02-21 10:21:48 obarthel Exp $
  *
  * :ts=4
  *
@@ -72,9 +72,10 @@ __fputc_check(FILE *stream)
 	{
 		SHOWMSG("this file is not even in use");
 
+		SET_FLAG(file->iob_Flags,IOBF_ERROR);
+
 		__set_errno(EBADF);
 
-		SET_FLAG(file->iob_Flags,IOBF_ERROR);
 		goto out;
 	}
 
@@ -82,9 +83,10 @@ __fputc_check(FILE *stream)
 	{
 		SHOWMSG("this stream is not write enabled");
 
+		SET_FLAG(file->iob_Flags,IOBF_ERROR);
+
 		__set_errno(EBADF);
 
-		SET_FLAG(file->iob_Flags,IOBF_ERROR);
 		goto out;
 	}
 
@@ -94,7 +96,7 @@ __fputc_check(FILE *stream)
 		goto out;
 	}
 
-	result = OK;
+	result = 0;
 
  out:
 
@@ -148,7 +150,7 @@ fputc(int c,FILE *stream)
 
 	assert( FLAG_IS_SET(file->iob_Flags,IOBF_IN_USE) );
 
-	if(__fputc_check(stream) != OK)
+	if(__fputc_check(stream) < 0)
 		goto out;
 
 	result = __fputc(c,stream,(file->iob_Flags & IOBF_BUFFER_MODE));
diff --git a/library/stdio_fputs.c b/library/stdio_fputs.c
index a7239d2..e894f23 100644
--- a/library/stdio_fputs.c
+++ b/library/stdio_fputs.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_fputs.c,v 1.3 2005-02-03 16:56:16 obarthel Exp $
+ * $Id: stdio_fputs.c,v 1.4 2005-02-21 10:21:49 obarthel Exp $
  *
  * :ts=4
  *
@@ -79,7 +79,7 @@ fputs(const char *s, FILE *stream)
 	if(buffer_mode == IOBF_BUFFER_MODE_NONE)
 		buffer_mode = IOBF_BUFFER_MODE_LINE;
 
-	if(__fputc_check(stream) != OK)
+	if(__fputc_check(stream) < 0)
 		goto out;
 
 	while((c = (*s++)) != '\0')
@@ -88,7 +88,7 @@ fputs(const char *s, FILE *stream)
 			goto out;
 	}
 
-	result = OK;
+	result = 0;
 
  out:
 
@@ -96,7 +96,7 @@ fputs(const char *s, FILE *stream)
 	   may have buffered data around, queued to be printed right now.
 	   This is intended to improve performance as it takes more effort
 	   to write a single character to a file than to write a bunch. */
-	if(result == OK && (file->iob_Flags & IOBF_BUFFER_MODE) == IOBF_BUFFER_MODE_NONE)
+	if(result == 0 && (file->iob_Flags & IOBF_BUFFER_MODE) == IOBF_BUFFER_MODE_NONE)
 	{
 		if(__iob_write_buffer_is_valid(file) && __flush_iob_write_buffer(file) < 0)
 		{
diff --git a/library/stdio_fread.c b/library/stdio_fread.c
index f93f84a..98653f4 100644
--- a/library/stdio_fread.c
+++ b/library/stdio_fread.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_fread.c,v 1.3 2005-02-03 16:56:16 obarthel Exp $
+ * $Id: stdio_fread.c,v 1.4 2005-02-21 10:21:49 obarthel Exp $
  *
  * :ts=4
  *
@@ -82,9 +82,10 @@ fread(void *ptr,size_t element_size,size_t count,FILE *stream)
 	{
 		SHOWMSG("this file is not even in use");
 
+		SET_FLAG(file->iob_Flags,IOBF_ERROR);
+
 		__set_errno(EBADF);
 
-		SET_FLAG(file->iob_Flags,IOBF_ERROR);
 		goto out;
 	}
 
@@ -92,9 +93,10 @@ fread(void *ptr,size_t element_size,size_t count,FILE *stream)
 	{
 		SHOWMSG("this file is not read-enabled");
 
+		SET_FLAG(file->iob_Flags,IOBF_ERROR);
+
 		__set_errno(EBADF);
 
-		SET_FLAG(file->iob_Flags,IOBF_ERROR);
 		goto out;
 	}
 
diff --git a/library/stdio_fseek.c b/library/stdio_fseek.c
index 11ff874..50f463c 100644
--- a/library/stdio_fseek.c
+++ b/library/stdio_fseek.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_fseek.c,v 1.5 2005-02-20 15:46:52 obarthel Exp $
+ * $Id: stdio_fseek.c,v 1.6 2005-02-21 10:21:49 obarthel Exp $
  *
  * :ts=4
  *
@@ -80,9 +80,10 @@ fseek(FILE *stream, long int offset, int wherefrom)
  	{
  		SHOWMSG("this file is not even in use");
 
+		SET_FLAG(file->iob_Flags,IOBF_ERROR);
+
 		__set_errno(EBADF);
  
-		SET_FLAG(file->iob_Flags,IOBF_ERROR);
  		goto out;
  	}
 
@@ -90,9 +91,10 @@ fseek(FILE *stream, long int offset, int wherefrom)
 	{
 		SHOWMSG("invalid wherefrom parameter");
 
+		SET_FLAG(file->iob_Flags,IOBF_ERROR);
+
 		__set_errno(EBADF);
 
-		SET_FLAG(file->iob_Flags,IOBF_ERROR);
 		goto out;
 	}
 
diff --git a/library/stdio_fsetpos.c b/library/stdio_fsetpos.c
index fd13972..87a84e7 100644
--- a/library/stdio_fsetpos.c
+++ b/library/stdio_fsetpos.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_fsetpos.c,v 1.3 2005-02-03 16:56:16 obarthel Exp $
+ * $Id: stdio_fsetpos.c,v 1.4 2005-02-21 10:21:49 obarthel Exp $
  *
  * :ts=4
  *
@@ -76,7 +76,7 @@ fsetpos(FILE *stream, fpos_t *pos)
 		goto out;
 	}
 
-	result = OK;
+	result = 0;
 
  out:
 
diff --git a/library/stdio_ftell.c b/library/stdio_ftell.c
index e368d25..3ae10ad 100644
--- a/library/stdio_ftell.c
+++ b/library/stdio_ftell.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_ftell.c,v 1.5 2005-02-20 15:46:52 obarthel Exp $
+ * $Id: stdio_ftell.c,v 1.6 2005-02-21 10:21:49 obarthel Exp $
  *
  * :ts=4
  *
@@ -74,9 +74,10 @@ ftell(FILE *stream)
 	{
 		SHOWMSG("this file is not even in use");
 
+		SET_FLAG(file->iob_Flags,IOBF_ERROR);
+
 		__set_errno(EBADF);
 
-		SET_FLAG(file->iob_Flags,IOBF_ERROR);
 		goto out;
 	}
 
diff --git a/library/stdio_fwrite.c b/library/stdio_fwrite.c
index 39ec162..de02b85 100644
--- a/library/stdio_fwrite.c
+++ b/library/stdio_fwrite.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_fwrite.c,v 1.4 2005-02-03 16:56:16 obarthel Exp $
+ * $Id: stdio_fwrite.c,v 1.5 2005-02-21 10:21:49 obarthel Exp $
  *
  * :ts=4
  *
@@ -82,9 +82,10 @@ fwrite(const void *ptr,size_t element_size,size_t count,FILE *stream)
 	{
 		SHOWMSG("this file is not even in use");
 
+		SET_FLAG(file->iob_Flags,IOBF_ERROR);
+
 		__set_errno(EBADF);
 
-		SET_FLAG(file->iob_Flags,IOBF_ERROR);
 		goto out;
 	}
 
@@ -92,9 +93,10 @@ fwrite(const void *ptr,size_t element_size,size_t count,FILE *stream)
 	{
 		SHOWMSG("this stream is not write-enabled");
 
+		SET_FLAG(file->iob_Flags,IOBF_ERROR);
+
 		__set_errno(EBADF);
 
-		SET_FLAG(file->iob_Flags,IOBF_ERROR);
 		goto out;
 	}
 
diff --git a/library/stdio_gets.c b/library/stdio_gets.c
index 190925f..e2c9cf1 100644
--- a/library/stdio_gets.c
+++ b/library/stdio_gets.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_gets.c,v 1.3 2005-02-03 16:56:16 obarthel Exp $
+ * $Id: stdio_gets.c,v 1.4 2005-02-21 10:21:49 obarthel Exp $
  *
  * :ts=4
  *
@@ -75,7 +75,7 @@ gets(char *s)
 	/* Take care of the checks and data structure changes that
 	 * need to be handled only once for this stream.
 	 */
-	if(__fgetc_check(stdin) != OK)
+	if(__fgetc_check(stdin) < 0)
 	{
 		result = NULL;
 		goto out;
diff --git a/library/stdio_puts.c b/library/stdio_puts.c
index 7e17012..ceca796 100644
--- a/library/stdio_puts.c
+++ b/library/stdio_puts.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_puts.c,v 1.4 2005-02-03 16:56:16 obarthel Exp $
+ * $Id: stdio_puts.c,v 1.5 2005-02-21 10:22:00 obarthel Exp $
  *
  * :ts=4
  *
@@ -78,7 +78,7 @@ puts(const char *s)
 	if(buffer_mode == IOBF_BUFFER_MODE_NONE)
 		buffer_mode = IOBF_BUFFER_MODE_LINE;
 
-	if(__fputc_check(stdout) != OK)
+	if(__fputc_check(stdout) < 0)
 		goto out;
 
 	while((c = (*s++)) != '\0')
@@ -90,7 +90,7 @@ puts(const char *s)
 	if(__putc('\n',stdout,buffer_mode) == EOF)
 		goto out;
 
-	result = OK;
+	result = 0;
 
  out:
 
@@ -98,7 +98,7 @@ puts(const char *s)
 	   may have buffered data around, queued to be printed right now.
 	   This is intended to improve performance as it takes more effort
 	   to write a single character to a file than to write a bunch. */
-	if(result == OK && (file->iob_Flags & IOBF_BUFFER_MODE) == IOBF_BUFFER_MODE_NONE)
+	if(result == 0 && (file->iob_Flags & IOBF_BUFFER_MODE) == IOBF_BUFFER_MODE_NONE)
 	{
 		if(__iob_write_buffer_is_valid(file) && __flush_iob_write_buffer(file) < 0)
 		{
diff --git a/library/stdio_record_locking.c b/library/stdio_record_locking.c
index 2dc2d0f..d8b9502 100644
--- a/library/stdio_record_locking.c
+++ b/library/stdio_record_locking.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_record_locking.c,v 1.1 2005-02-18 18:53:16 obarthel Exp $
+ * $Id: stdio_record_locking.c,v 1.2 2005-02-21 10:22:00 obarthel Exp $
  *
  * :ts=4
  *
@@ -1173,7 +1173,7 @@ __handle_record_locking(int cmd,struct flock * l,struct fd * fd,int * error_ptr)
 		}
 	}
 
-	result = OK;
+	result = 0;
 
  out:
 
@@ -1186,7 +1186,7 @@ __handle_record_locking(int cmd,struct flock * l,struct fd * fd,int * error_ptr)
 	UnLock(parent_dir);
 	PROFILE_ON();
 
-	if(result != OK && error != OK)
+	if(result != 0 && error != OK)
 	{
 		SetIoErr(error);
 
diff --git a/library/stdio_setvbuf.c b/library/stdio_setvbuf.c
index ac8ee90..010b167 100644
--- a/library/stdio_setvbuf.c
+++ b/library/stdio_setvbuf.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_setvbuf.c,v 1.4 2005-02-03 16:56:16 obarthel Exp $
+ * $Id: stdio_setvbuf.c,v 1.5 2005-02-21 10:22:00 obarthel Exp $
  *
  * :ts=4
  *
@@ -105,9 +105,10 @@ setvbuf(FILE *stream,char *buf,int bufmode,size_t size)
 	{
 		SHOWMSG("this file is not even in use");
 
+		SET_FLAG(file->iob_Flags,IOBF_ERROR);
+
 		__set_errno(EBADF);
 
-		SET_FLAG(file->iob_Flags,IOBF_ERROR);
 		goto out;
 	}
 
@@ -183,7 +184,7 @@ setvbuf(FILE *stream,char *buf,int bufmode,size_t size)
 
 	new_buffer = NULL;
 
-	result = OK;
+	result = 0;
 
  out:
 
diff --git a/library/stdio_ungetc.c b/library/stdio_ungetc.c
index 3db7331..86b3576 100644
--- a/library/stdio_ungetc.c
+++ b/library/stdio_ungetc.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_ungetc.c,v 1.3 2005-02-03 16:56:16 obarthel Exp $
+ * $Id: stdio_ungetc.c,v 1.4 2005-02-21 10:22:01 obarthel Exp $
  *
  * :ts=4
  *
@@ -74,9 +74,10 @@ ungetc(int c,FILE *stream)
 	{
 		SHOWMSG("this file is not even in use");
 
+		SET_FLAG(file->iob_Flags,IOBF_ERROR);
+
 		__set_errno(EBADF);
 
-		SET_FLAG(file->iob_Flags,IOBF_ERROR);
 		goto out;
 	}
 
@@ -85,9 +86,10 @@ ungetc(int c,FILE *stream)
 	{
 		SHOWMSG("can't even read from this file");
 
+		SET_FLAG(file->iob_Flags,IOBF_ERROR);
+
 		__set_errno(EACCES);
 
-		SET_FLAG(file->iob_Flags,IOBF_ERROR);
 		goto out;
 	}
 
@@ -96,9 +98,10 @@ ungetc(int c,FILE *stream)
 	{
 		SHOWMSG("cannot push back an EOF");
 
+		SET_FLAG(file->iob_Flags,IOBF_ERROR);
+
 		__set_errno(EINVAL);
 
-		SET_FLAG(file->iob_Flags,IOBF_ERROR);
 		goto out;
 	}
 
@@ -121,9 +124,10 @@ ungetc(int c,FILE *stream)
 	{
 		SHOWMSG("no room to push back");
 
+		SET_FLAG(file->iob_Flags,IOBF_ERROR);
+
 		__set_errno(ENOBUFS);
 
-		SET_FLAG(file->iob_Flags,IOBF_ERROR);
 		goto out;
 	}
 
diff --git a/library/stdio_vfprintf.c b/library/stdio_vfprintf.c
index b38efa1..260dd00 100644
--- a/library/stdio_vfprintf.c
+++ b/library/stdio_vfprintf.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_vfprintf.c,v 1.9 2005-02-20 13:19:40 obarthel Exp $
+ * $Id: stdio_vfprintf.c,v 1.10 2005-02-21 10:22:01 obarthel Exp $
  *
  * :ts=4
  *
@@ -172,7 +172,7 @@ vfprintf(FILE * stream,const char * format, va_list arg)
 	assert( FLAG_IS_SET(iob->iob_Flags,IOBF_IN_USE) );
 	assert( iob->iob_BufferSize > 0 );
 
-	if(__fputc_check(stream) != OK)
+	if(__fputc_check(stream) < 0)
 		goto out;
 
 	while((c = (*format++)) != '\0')
diff --git a/library/stdio_vfscanf.c b/library/stdio_vfscanf.c
index 145fdc7..8cc1e36 100644
--- a/library/stdio_vfscanf.c
+++ b/library/stdio_vfscanf.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_vfscanf.c,v 1.8 2005-02-03 16:56:16 obarthel Exp $
+ * $Id: stdio_vfscanf.c,v 1.9 2005-02-21 10:22:01 obarthel Exp $
  *
  * :ts=4
  *
@@ -98,7 +98,7 @@ __vfscanf(FILE *stream, const char *format, va_list arg)
 	}
 	#endif /* CHECK_FOR_NULL_POINTERS */
 
-	if(__fgetc_check(stream) != OK)
+	if(__fgetc_check(stream) < 0)
 		goto out;
 
 	/* Just so we can detect errors and tell them apart from
diff --git a/library/unistd_fchown.c b/library/unistd_fchown.c
index e561d1d..d9ca826 100644
--- a/library/unistd_fchown.c
+++ b/library/unistd_fchown.c
@@ -1,5 +1,5 @@
 /*
- * $Id: unistd_fchown.c,v 1.5 2005-02-18 18:53:17 obarthel Exp $
+ * $Id: unistd_fchown.c,v 1.6 2005-02-21 10:22:02 obarthel Exp $
  *
  * :ts=4
  *
@@ -159,7 +159,7 @@ fchown(int file_descriptor, uid_t owner, gid_t group)
 		goto out;
 	}
 
-	result = OK;
+	result = 0;
 
  out:
 
diff --git a/library/unistd_fdatasync.c b/library/unistd_fdatasync.c
index 89f87d5..f5a5f4b 100644
--- a/library/unistd_fdatasync.c
+++ b/library/unistd_fdatasync.c
@@ -1,5 +1,5 @@
 /*
- * $Id: unistd_fdatasync.c,v 1.2 2005-02-18 18:53:17 obarthel Exp $
+ * $Id: unistd_fdatasync.c,v 1.3 2005-02-21 10:22:02 obarthel Exp $
  *
  * :ts=4
  *
@@ -79,7 +79,7 @@ fdatasync(int file_descriptor)
 
 	__sync_fd(fd,0); /* flush just the data */
 
-	result = OK;
+	result = 0;
 
  out:
 
diff --git a/library/unistd_fsync.c b/library/unistd_fsync.c
index 182b6ef..a84caf0 100644
--- a/library/unistd_fsync.c
+++ b/library/unistd_fsync.c
@@ -1,5 +1,5 @@
 /*
- * $Id: unistd_fsync.c,v 1.2 2005-02-18 18:53:17 obarthel Exp $
+ * $Id: unistd_fsync.c,v 1.3 2005-02-21 10:22:02 obarthel Exp $
  *
  * :ts=4
  *
@@ -78,7 +78,7 @@ fsync(int file_descriptor)
 
 	__sync_fd(fd,1); /* flush everything */
 
-	result = OK;
+	result = 0;
 
  out:
 
diff --git a/library/unistd_translateu2a.c b/library/unistd_translateu2a.c
index 1e36dfc..8e22b19 100644
--- a/library/unistd_translateu2a.c
+++ b/library/unistd_translateu2a.c
@@ -1,5 +1,5 @@
 /*
- * $Id: unistd_translateu2a.c,v 1.5 2005-02-16 14:48:17 obarthel Exp $
+ * $Id: unistd_translateu2a.c,v 1.6 2005-02-21 10:22:02 obarthel Exp $
  *
  * :ts=4
  *
@@ -105,7 +105,7 @@ __translate_unix_to_amiga_path_name(char const ** name_ptr,struct name_translati
 
 	/* Prepend an absolute path to the name, if such a path was previously set
 	   as the current directory. */
-	if(__translate_relative_path_name((const char **)&name,nti->substitute,sizeof(nti->substitute)) != OK)
+	if(__translate_relative_path_name((const char **)&name,nti->substitute,sizeof(nti->substitute)) < 0)
 	{
 		SHOWMSG("relative path name could not be worked into the pattern");
 		goto out;