[JVCL-Checkins] CVS: dev/JVCL3/run JvStrings.pas,1.4,1.5

[Andreas H. <ah...@us...>]

Update of /cvsroot/jvcl/dev/JVCL3/run
In directory sc8-pr-cvs1:/tmp/cvs-serv23795/run

Modified Files:
	JvStrings.pas 
Log Message:
removed function result warning (update)

Index: JvStrings.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvStrings.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** JvStrings.pas	24 Sep 2003 10:15:15 -0000	1.4
--- JvStrings.pas	24 Sep 2003 11:14:21 -0000	1.5
***************
*** 32,36 ****
  
  uses
!   Windows, Messages, SysUtils, Classes, Graphics, dialogs;
  
  {regular expressions}
--- 32,39 ----
  
  uses
! {$IFDEF MSWINDOWS}
!   Windows,
! {$ENDIF}
!   SysUtils, Classes, Graphics, dialogs;
  
  {regular expressions}
***************
*** 122,126 ****
--- 125,131 ----
  
  function NameValuesToXML(aText: string): string;
+ {$IFDEF MSWINDOWS}
  procedure LoadResourceFile(aFile: string; ms: TMemoryStream);
+ {$ENDIF}
  procedure DirFiles(aDir, amask: string; aFileList: TStringlist);
  procedure RecurseDirFiles(myDir: string; var aFileList: TStringlist);
***************
*** 945,948 ****
--- 950,954 ----
  end;
  
+ {$IFDEF MSWINDOWS}
  procedure LoadResourceFile(aFile: string; ms: TMemoryStream);
  var
***************
*** 968,971 ****
--- 974,978 ----
    FreeResource(HGlobal);
  end;
+ {$ENDIF}
  
  procedure GetNames(aText: string; aList: TStringList);
***************
*** 1307,1315 ****
    InBuf: array[0..3] of byte;
    OutBuf: array[0..2] of byte;
  begin
    if ((Length(S) mod 4) <> 0) or (S = '') then
      raise Exception.Create('Base64: Incorrect string format');
  
!   SetLength(Result, ((Length(S) div 4) - 1) * 3);
    for i := 1 to ((Length(S) div 4) - 1) do
    begin
--- 1314,1323 ----
    InBuf: array[0..3] of byte;
    OutBuf: array[0..2] of byte;
+   RetValue: string;
  begin
    if ((Length(S) mod 4) <> 0) or (S = '') then
      raise Exception.Create('Base64: Incorrect string format');
  
!   SetLength(RetValue, ((Length(S) div 4) - 1) * 3);
    for i := 1 to ((Length(S) div 4) - 1) do
    begin
***************
*** 1358,1362 ****
      OutBuf[1] := (InBuf[1] shl 4) or ((InBuf[2] shr 2) and $0F);
      OutBuf[2] := (InBuf[2] shl 6) or (InBuf[3] and $3F);
!     Move(OutBuf, Result[(i - 1) * 3 + 1], 3);
    end;
    if S <> '' then
--- 1366,1370 ----
      OutBuf[1] := (InBuf[1] shl 4) or ((InBuf[2] shr 2) and $0F);
      OutBuf[2] := (InBuf[2] shl 6) or (InBuf[3] and $3F);
!     Move(OutBuf, RetValue[(i - 1) * 3 + 1], 3);
    end;
    if S <> '' then
***************
*** 1386,1390 ****
          InBuf[1] := 63;
        OutBuf[0] := (InBuf[0] shl 2) or ((InBuf[1] shr 4) and $03);
!       Result := Result + char(OutBuf[0]);
      end
      else if InBuf[3] = 61 then
--- 1394,1398 ----
          InBuf[1] := 63;
        OutBuf[0] := (InBuf[0] shl 2) or ((InBuf[1] shr 4) and $03);
!       RetValue := RetValue + char(OutBuf[0]);
      end
      else if InBuf[3] = 61 then
***************
*** 1422,1426 ****
        OutBuf[0] := (InBuf[0] shl 2) or ((InBuf[1] shr 4) and $03);
        OutBuf[1] := (InBuf[1] shl 4) or ((InBuf[2] shr 2) and $0F);
!       Result := Result + char(OutBuf[0]) + char(OutBuf[1]);
      end
      else
--- 1430,1434 ----
        OutBuf[0] := (InBuf[0] shl 2) or ((InBuf[1] shr 4) and $03);
        OutBuf[1] := (InBuf[1] shl 4) or ((InBuf[2] shr 2) and $0F);
!       RetValue := RetValue + char(OutBuf[0]) + char(OutBuf[1]);
      end
      else
***************
*** 1469,1477 ****
        OutBuf[1] := (InBuf[1] shl 4) or ((InBuf[2] shr 2) and $0F);
        OutBuf[2] := (InBuf[2] shl 6) or (InBuf[3] and $3F);
!       Result := Result + Char(OutBuf[0]) + Char(OutBuf[1]) + Char(OutBuf[2]);
      end;
!   end
!   else
!     Result := '';
  end;
  
--- 1477,1484 ----
        OutBuf[1] := (InBuf[1] shl 4) or ((InBuf[2] shr 2) and $0F);
        OutBuf[2] := (InBuf[2] shl 6) or (InBuf[3] and $3F);
!       RetValue := RetValue + Char(OutBuf[0]) + Char(OutBuf[1]) + Char(OutBuf[2]);
      end;
!   end;
!   Result := RetValue;
  end;