Browse Source

* Char -> AnsiChar

Michael VAN CANNEYT 2 years ago
parent
commit
4b1681aa1e
6 changed files with 37 additions and 37 deletions
  1. 2 2
      rtl/wii/dos.pp
  2. 19 19
      rtl/wii/libch.inc
  3. 1 1
      rtl/wii/sysdir.inc
  4. 3 3
      rtl/wii/sysfile.inc
  5. 9 9
      rtl/wii/system.pp
  6. 3 3
      rtl/wii/wiih.inc

+ 2 - 2
rtl/wii/dos.pp

@@ -91,7 +91,7 @@ procedure DeleteExtIO ();
 begin
 end;
 
-function Createport(name : PChar; pri : longint): integer;
+function Createport(name : PAnsiChar; pri : longint): integer;
 begin
   result := -1;
 end;
@@ -241,7 +241,7 @@ procedure AddDevice(str : String);
 begin
 end;
 
-function MakeDeviceName(str : pchar): string;
+function MakeDeviceName(str : PAnsiChar): string;
 begin
   result := '';
 end;

+ 19 - 19
rtl/wii/libch.inc

@@ -38,17 +38,17 @@ type
   end;
   Timeval = TTimeval;
 (* Some libc functions *)
-//function printf(format: Pchar; args: array of const): longint; cdecl; external;
-function printf(format: Pchar): longint; cdecl; varargs; external;
-//function sprintf(s: Pchar; format: Pchar; args: array of const): longint; cdecl; external;
-function sprintf(s: Pchar; format: Pchar): longint; varargs; cdecl; external;
-//function iprintf(format: Pchar; args: array of const): longint; cdecl; external;
-function iprintf(format: Pchar): longint; varargs; cdecl; external;
-//function scanf(format: Pchar; args: array of const): longint; cdecl; external;
-function scanf(format: Pchar): longint; cdecl; varargs; external;
-//function sscanf(s: Pchar; format: Pchar; args: array of const): longint; cdecl; external;
-function sscanf(s: Pchar; format: Pchar): longint; cdecl; varargs; external;
-function strcmp(s1: Pchar; s2: Pchar): longint; cdecl; external;
+//function printf(format: PAnsiChar; args: array of const): longint; cdecl; external;
+function printf(format: PAnsiChar): longint; cdecl; varargs; external;
+//function sprintf(s: PAnsiChar; format: PAnsiChar; args: array of const): longint; cdecl; external;
+function sprintf(s: PAnsiChar; format: PAnsiChar): longint; varargs; cdecl; external;
+//function iprintf(format: PAnsiChar; args: array of const): longint; cdecl; external;
+function iprintf(format: PAnsiChar): longint; varargs; cdecl; external;
+//function scanf(format: PAnsiChar; args: array of const): longint; cdecl; external;
+function scanf(format: PAnsiChar): longint; cdecl; varargs; external;
+//function sscanf(s: PAnsiChar; format: PAnsiChar; args: array of const): longint; cdecl; external;
+function sscanf(s: PAnsiChar; format: PAnsiChar): longint; cdecl; varargs; external;
+function strcmp(s1: PAnsiChar; s2: PAnsiChar): longint; cdecl; external;
 
 function malloc(size: integer): pointer; cdecl; external;
 function realloc(ptr: pointer; size: integer): pointer; cdecl; external;
@@ -157,7 +157,7 @@ function S_ISSOCK(m: longint): boolean; inline;
 type
   dirent = record
     d_ino: longint;
-    d_name: array [0..NAME_MAX] of char;
+    d_name: array [0..NAME_MAX] of AnsiChar;
   end;
   PDirent = ^dirent;
   PPDirent = ^PDirent;
@@ -171,7 +171,7 @@ type
 
 (* DIR handling *)
 function closedir(dirp: PDIR): longint; cdecl; external;
-function opendir(const dirname: pchar): PDIR; cdecl; external;
+function opendir(const dirname: PAnsiChar): PDIR; cdecl; external;
 function readdir(dirp: PDIR): PDirent; cdecl; external;
 function readdir_r(dirp: PDIR; entry: PDirent; result: PPDirent): longint; cdecl; external;
 procedure rewinddir(dirp: PDIR); cdecl; external;
@@ -179,13 +179,13 @@ procedure seekdir(dirp: PDIR; loc: longint); cdecl; external;
 function telldir(dirp: PDIR): longint; cdecl; external;
 
 
-function diropen(const path: pchar): PDIR_ITER; cdecl; external;
+function diropen(const path: PAnsiChar): PDIR_ITER; cdecl; external;
 function dirreset(dirState: PDIR_ITER): longint; cdecl; external;
-function dirnext(dirState: PDIR_ITER; filename: pchar; filestat: Pstat): longint; cdecl; external;
+function dirnext(dirState: PDIR_ITER; filename: PAnsiChar; filestat: Pstat): longint; cdecl; external;
 function dirclose(dirState: PDIR_ITER): longint; cdecl; external;
 
 (* File handling *)
-function fopen(filename: Pchar; modes: Pchar): P_FILE; cdecl; external;
+function fopen(filename: PAnsiChar; modes: PAnsiChar): P_FILE; cdecl; external;
 function fread(ptr: pointer; size: longint; n: longint; stream: P_FILE): longint; cdecl; external;
 function fread(var ptr; size: longint; n: longint; var stream: _FILE): longint; cdecl; external;
 function fwrite(ptr: pointer; size: longint; n: longint; s: P_FILE): longint; cdecl; external;
@@ -201,7 +201,7 @@ function fileno(para1: P_FILE): longint; cdecl; external;
 function fileno(var para1: _FILE): longint; cdecl; external;
 function fstat(fildes: longint; buf: PStat): longint; cdecl; external;
 function fstat(fildes: longint; var buf: TStat): longint; cdecl; external;
-function _stat(__file:Pchar; var __buf:Tstat):longint; cdecl; external name 'stat';
+function _stat(__file:PAnsiChar; var __buf:Tstat):longint; cdecl; external name 'stat';
 function ftruncate(fildes: longint; len: longint): longint; cdecl; external;
-function unlink(path: Pchar): longint; cdecl; external;
-function rename(para1: Pchar; para2: Pchar): longint; cdecl; external;
+function unlink(path: PAnsiChar): longint; cdecl; external;
+function rename(para1: PAnsiChar; para2: PAnsiChar): longint; cdecl; external;

+ 1 - 1
rtl/wii/sysdir.inc

@@ -36,7 +36,7 @@ procedure do_chdir(const s: rawbytestring);
 begin
   { TODO: convert callback to use rawbytestring to avoid conversion }
   if FileIODevice.DirIO.DoChdir <> nil then
-    FileIODevice.DirIO.DoChdir(pchar(s));
+    FileIODevice.DirIO.DoChdir(PAnsiChar(s));
 end;
 
 procedure do_GetDir(DriveNr: byte; var Dir: RawByteString);

+ 3 - 3
rtl/wii/sysfile.inc

@@ -29,14 +29,14 @@ begin
   //_fclose (_PFILE(pointer(handle))^);
 end;
 
-procedure do_erase(p: pchar; pchangeable: boolean);
+procedure do_erase(p: PAnsiChar; pchangeable: boolean);
 begin
   if FileIODevice.FileIO.DoErase <> nil then
     FileIODevice.FileIO.DoErase(p);
 //  _unlink(p);
 end;
 
-procedure do_rename(p1, p2: pchar; p1changeable, p2changeable: boolean);
+procedure do_rename(p1, p2: PAnsiChar; p1changeable, p2changeable: boolean);
 begin
 //  _rename(p1, p2);
   if FileIODevice.FileIO.DoRename <> nil then
@@ -93,7 +93,7 @@ begin
     FileIODevice.FileIO.DoTruncate(handle, pos);
 end;
 
-procedure do_open(var f; p: pchar; flags: longint; pchangeable: boolean);
+procedure do_open(var f; p: PAnsiChar; flags: longint; pchangeable: boolean);
 begin
 (*
 { close first if opened }

+ 9 - 9
rtl/wii/system.pp

@@ -38,8 +38,8 @@ const
   DriveSeparator = ':';
   ExtensionSeparator = '.';
   PathSeparator = ':';
-  AllowDirectorySeparators : set of char = ['\','/'];
-  AllowDriveSeparators : set of char = [':'];
+  AllowDirectorySeparators : set of AnsiChar = ['\','/'];
+  AllowDriveSeparators : set of AnsiChar = [':'];
   maxExitCode = 255;
 
   MaxPathLen = 1024; // BSDs since 1993, Solaris 10, Darwin
@@ -59,18 +59,18 @@ const
 
 var
   argc: LongInt = 0;
-  argv: PPChar;
-  envp: PPChar;
+  argv: PPAnsiChar;
+  envp: PPAnsiChar;
 //  errno: integer;
 
-function get_cmdline:Pchar;
+function get_cmdline:PAnsiChar;
 
-property cmdline:Pchar read get_cmdline;
+property cmdline:PAnsiChar read get_cmdline;
 
 implementation
 
 const
-  calculated_cmdline: Pchar = nil;
+  calculated_cmdline: PAnsiChar = nil;
   { System limits, POSIX value in parentheses, used for buffer and stack allocation }
   ARG_MAX  = 65536;   {4096}  { Maximum number of argument size     }
   PATH_MAX = 1024;    {255}   { Maximum number of bytes in pathname }
@@ -144,7 +144,7 @@ var
   len,j,
   size,i : longint;
   found  : boolean;
-  buf    : pchar;
+  buf    : PAnsiChar;
 
   procedure AddBuf;
   begin
@@ -198,7 +198,7 @@ begin
   FreeMem(buf,ARG_MAX);
 end;
 
-function get_cmdline:Pchar;
+function get_cmdline:PAnsiChar;
 
 begin
   if calculated_cmdline=nil then

+ 3 - 3
rtl/wii/wiih.inc

@@ -15,14 +15,14 @@
  *****************************************************************************}
 
 type
-  TDoOpen     = procedure (var f; p: pchar; flags: longint);
+  TDoOpen     = procedure (var f; p: PAnsiChar; flags: longint);
   TDoClose    = procedure (handle: THandle);
   TDoWrite    = function  (h: THandle; addr: pointer; len: longint): longint;
   TDoRead     = function  (h: THandle; addr: pointer; len: longint): longint;
   TDoSeek     = procedure (handle: THandle; pos: longint);
   TDoSeekend  = function  (handle: THandle): longint;
-  TDoErase    = procedure (p: pchar);
-  TDoRename   = procedure (p1, p2: pchar);
+  TDoErase    = procedure (p: PAnsiChar);
+  TDoRename   = procedure (p1, p2: PAnsiChar);
   TDoFilepos  = function  (handle: THandle): longint;
   TDoFilesize = function  (handle: THandle): longint;
   TDoTruncate = procedure (handle: THandle; pos: longint);