Browse Source

* Char -> AnsiChar

Michael VAN CANNEYT 2 years ago
parent
commit
a7cc9d55cf
4 changed files with 40 additions and 40 deletions
  1. 25 25
      rtl/nds/libch.inc
  2. 3 3
      rtl/nds/sysfile.inc
  3. 9 9
      rtl/nds/system.pp
  4. 3 3
      rtl/nds/sysutils.pp

+ 25 - 25
rtl/nds/libch.inc

@@ -33,17 +33,17 @@ type
 
 
 
 
 (* Some libc functions *)
 (* 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 malloc(size: integer): pointer; cdecl; external;
 function realloc(ptr: pointer; size: integer): pointer; cdecl; external;
 function realloc(ptr: pointer; size: integer): pointer; cdecl; external;
@@ -171,7 +171,7 @@ function S_ISSOCK(m: longint): boolean; inline;
 type
 type
   dirent = record
   dirent = record
     d_ino: longint;
     d_ino: longint;
-    d_name: array [0..NAME_MAX] of char;
+    d_name: array [0..NAME_MAX] of AnsiChar;
   end;
   end;
   PDirent = ^dirent;
   PDirent = ^dirent;
   PPDirent = ^PDirent;
   PPDirent = ^PDirent;
@@ -185,20 +185,20 @@ type
 
 
 (* DIR handling *)
 (* DIR handling *)
 function closedir(dirp: PDIR): longint; cdecl; external;
 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(dirp: PDIR): PDirent; cdecl; external;
 function readdir_r(dirp: PDIR; entry: PDirent; result: PPDirent): longint; cdecl; external;
 function readdir_r(dirp: PDIR; entry: PDirent; result: PPDirent): longint; cdecl; external;
 procedure rewinddir(dirp: PDIR); cdecl; external;
 procedure rewinddir(dirp: PDIR); cdecl; external;
 procedure seekdir(dirp: PDIR; loc: longint); cdecl; external;
 procedure seekdir(dirp: PDIR; loc: longint); cdecl; external;
 function telldir(dirp: PDIR): 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 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;
 function dirclose(dirState: PDIR_ITER): longint; cdecl; external;
 
 
 (* File handling *)
 (* 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(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 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;
 function fwrite(ptr: pointer; size: longint; n: longint; s: P_FILE): longint; cdecl; external;
@@ -214,23 +214,23 @@ function fileno(para1: P_FILE): longint; cdecl; external;
 function fileno(var para1: _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; buf: PStat): longint; cdecl; external;
 function fstat(fildes: longint; var buf: TStat): 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(path: Pchar; buf: Pstat): longint; cdecl; external name 'stat';
+function _stat(__file: PAnsiChar; var __buf: Tstat): longint; cdecl; external name 'stat';
+function _stat(path: PAnsiChar; buf: Pstat): longint; cdecl; external name 'stat';
 function ftruncate(fildes: longint; len: longint): longint; cdecl; external;
 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;
 
 
-function _open(path: Pchar; oflag: longint): longint; cdecl; external name 'open';
-function _open(path: Pchar; oflag, mode: longint): longint; cdecl; external name 'open';  
+function _open(path: PAnsiChar; oflag: longint): longint; cdecl; external name 'open';
+function _open(path: PAnsiChar; oflag, mode: longint): longint; cdecl; external name 'open';  
 function _read(fildes:longint; buf:pointer; nbytes:dword):longint;cdecl;external name 'read';
 function _read(fildes:longint; buf:pointer; nbytes:dword):longint;cdecl;external name 'read';
 function _read(fildes:longint; var buf; nbytes:dword):longint;cdecl;external name 'read';
 function _read(fildes:longint; var buf; nbytes:dword):longint;cdecl;external name 'read';
 function _write(fildes:longint; buf:pointer; nbytes:dword):longint;cdecl;external name 'write';
 function _write(fildes:longint; buf:pointer; nbytes:dword):longint;cdecl;external name 'write';
 function _write(fildes:longint; var buf; nbytes:dword):longint;cdecl;external name 'write';
 function _write(fildes:longint; var buf; nbytes:dword):longint;cdecl;external name 'write';
 function _lseek(fildes:longint; offset:longint; whence:longint):longint;cdecl;external name 'lseek';
 function _lseek(fildes:longint; offset:longint; whence:longint):longint;cdecl;external name 'lseek';
 function _close(fildes:longint): longint; cdecl; external name 'close';
 function _close(fildes:longint): longint; cdecl; external name 'close';
-function _unlink(path:Pchar): longint; cdecl; external name 'unlink';
-function _rename(para1: Pchar; para2: Pchar): longint; cdecl; external name 'rename';
-function _access(path: Pchar; mode: longint): longint; cdecl; external name 'access';
+function _unlink(path:PAnsiChar): longint; cdecl; external name 'unlink';
+function _rename(para1: PAnsiChar; para2: PAnsiChar): longint; cdecl; external name 'rename';
+function _access(path: PAnsiChar; mode: longint): longint; cdecl; external name 'access';
 function _tell(fildes: longint): longint; cdecl; external name 'tell';
 function _tell(fildes: longint): longint; cdecl; external name 'tell';
 function _isatty(fildes: longint): longint; cdecl; external name 'isatty';
 function _isatty(fildes: longint): longint; cdecl; external name 'isatty';
 function _truncate(fildes: longint; len: longint): longint; cdecl; external name 'truncate';
 function _truncate(fildes: longint; len: longint): longint; cdecl; external name 'truncate';

+ 3 - 3
rtl/nds/sysfile.inc

@@ -88,7 +88,7 @@ begin
     InOutRes := 0;
     InOutRes := 0;
 end;
 end;
 
 
-procedure do_erase(p: pchar; pchangeable: boolean);
+procedure do_erase(p: PAnsiChar; pchangeable: boolean);
 var
 var
   res: longint;
   res: longint;
 begin
 begin
@@ -100,7 +100,7 @@ begin
     InOutRes := 0;
     InOutRes := 0;
 end;
 end;
 
 
-procedure do_rename(p1, p2: pchar; p1changeable, p2changeable: boolean);
+procedure do_rename(p1, p2: PAnsiChar; p1changeable, p2changeable: boolean);
 var
 var
   res: longint;
   res: longint;
 begin
 begin
@@ -209,7 +209,7 @@ begin
     InOutRes := 0;
     InOutRes := 0;
 end;
 end;
 
 
-procedure do_open(var f;p:pchar;flags:longint; pchangeable: boolean);
+procedure do_open(var f;p:PAnsiChar;flags:longint; pchangeable: boolean);
 {
 {
   filerec and textrec have both handle and mode as the first items so
   filerec and textrec have both handle and mode as the first items so
   they could use the same routine for opening/creating.
   they could use the same routine for opening/creating.

+ 9 - 9
rtl/nds/system.pp

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

+ 3 - 3
rtl/nds/sysutils.pp

@@ -66,7 +66,7 @@ begin
     fmOpenWrite : NDSFlags := NDSFlags or O_WrOnly;
     fmOpenWrite : NDSFlags := NDSFlags or O_WrOnly;
     fmOpenReadWrite : NDSFlags := NDSFlags or O_RdWr;
     fmOpenReadWrite : NDSFlags := NDSFlags or O_RdWr;
   end;
   end;
-  FileOpen := _open(pchar(SystemFileName), NDSFlags);
+  FileOpen := _open(PAnsiChar(SystemFileName), NDSFlags);
 end;
 end;
 
 
 
 
@@ -172,7 +172,7 @@ var
   SystemFileName: RawByteString;
   SystemFileName: RawByteString;
 begin
 begin
   SystemFileName:=ToSingleByteFileSystemEncodedFileName(FileName);
   SystemFileName:=ToSingleByteFileSystemEncodedFileName(FileName);
-  if (_stat(pchar(SystemFileName), Info) < 0) or S_ISDIR(info.st_mode) then
+  if (_stat(PAnsiChar(SystemFileName), Info) < 0) or S_ISDIR(info.st_mode) then
     exit(-1)
     exit(-1)
   else 
   else 
     Result := (info.st_mtime);
     Result := (info.st_mtime);
@@ -217,7 +217,7 @@ var
   SystemFileName: RawByteString;
   SystemFileName: RawByteString;
 begin
 begin
   SystemFileName:=ToSingleByteFileSystemEncodedFileName(FileName);
   SystemFileName:=ToSingleByteFileSystemEncodedFileName(FileName);
-  If _stat(pchar(SystemFileName), Info) <> 0 then
+  If _stat(PAnsiChar(SystemFileName), Info) <> 0 then
     Result := -1
     Result := -1
   Else
   Else
     Result := (Info.st_mode shr 16) and $ffff;
     Result := (Info.st_mode shr 16) and $ffff;