Просмотр исходного кода

- Text i/o routines are not expected to return a value.

git-svn-id: trunk@26834 -
sergei 11 лет назад
Родитель
Сommit
1f22c2de22
2 измененных файлов с 6 добавлено и 12 удалено
  1. 3 6
      rtl/win/syswin.inc
  2. 3 6
      rtl/wince/system.pp

+ 3 - 6
rtl/win/syswin.inc

@@ -426,7 +426,7 @@ var
   ErrorBuf : array[0..ErrorBufferLength] of char;
   ErrorBuf : array[0..ErrorBufferLength] of char;
   ErrorLen : SizeInt;
   ErrorLen : SizeInt;
 
 
-Function ErrorWrite(Var F: TextRec): Integer;
+procedure ErrorWrite(Var F: TextRec);
 {
 {
   An error message should always end with #13#10#13#10
   An error message should always end with #13#10#13#10
 }
 }
@@ -451,11 +451,10 @@ Begin
         end;
         end;
       Dec(F.BufPos,i);
       Dec(F.BufPos,i);
     end;
     end;
-  ErrorWrite:=0;
 End;
 End;
 
 
 
 
-Function ErrorClose(Var F: TextRec): Integer;
+procedure ErrorClose(Var F: TextRec);
 begin
 begin
   if ErrorLen>0 then
   if ErrorLen>0 then
    begin
    begin
@@ -463,17 +462,15 @@ begin
      ErrorLen:=0;
      ErrorLen:=0;
    end;
    end;
   ErrorLen:=0;
   ErrorLen:=0;
-  ErrorClose:=0;
 end;
 end;
 
 
 
 
-Function ErrorOpen(Var F: TextRec): Integer;
+procedure ErrorOpen(Var F: TextRec);
 Begin
 Begin
   TextRec(F).InOutFunc:=@ErrorWrite;
   TextRec(F).InOutFunc:=@ErrorWrite;
   TextRec(F).FlushFunc:=@ErrorWrite;
   TextRec(F).FlushFunc:=@ErrorWrite;
   TextRec(F).CloseFunc:=@ErrorClose;
   TextRec(F).CloseFunc:=@ErrorClose;
   ErrorLen:=0;
   ErrorLen:=0;
-  ErrorOpen:=0;
 End;
 End;
 
 
 
 

+ 3 - 6
rtl/wince/system.pp

@@ -1640,7 +1640,7 @@ var
   ErrorBufW : array[0..ErrorBufferLength] of widechar;
   ErrorBufW : array[0..ErrorBufferLength] of widechar;
   ErrorLen : longint;
   ErrorLen : longint;
 
 
-Function ErrorWrite(Var F: TextRec): Integer;
+procedure ErrorWrite(Var F: TextRec);
 {
 {
   An error message should always end with #13#10#13#10
   An error message should always end with #13#10#13#10
 }
 }
@@ -1666,11 +1666,10 @@ Begin
         end;
         end;
       Dec(F.BufPos,i);
       Dec(F.BufPos,i);
     end;
     end;
-  ErrorWrite:=0;
 End;
 End;
 
 
 
 
-Function ErrorClose(Var F: TextRec): Integer;
+procedure ErrorClose(Var F: TextRec);
 begin
 begin
   if ErrorLen>0 then
   if ErrorLen>0 then
    begin
    begin
@@ -1679,17 +1678,15 @@ begin
      ErrorLen:=0;
      ErrorLen:=0;
    end;
    end;
   ErrorLen:=0;
   ErrorLen:=0;
-  ErrorClose:=0;
 end;
 end;
 
 
 
 
-Function ErrorOpen(Var F: TextRec): Integer;
+procedure ErrorOpen(Var F: TextRec);
 Begin
 Begin
   TextRec(F).InOutFunc:=@ErrorWrite;
   TextRec(F).InOutFunc:=@ErrorWrite;
   TextRec(F).FlushFunc:=@ErrorWrite;
   TextRec(F).FlushFunc:=@ErrorWrite;
   TextRec(F).CloseFunc:=@ErrorClose;
   TextRec(F).CloseFunc:=@ErrorClose;
   ErrorLen:=0;
   ErrorLen:=0;
-  ErrorOpen:=0;
 End;
 End;