Browse Source

* PChar -> PAnsichar

Michaël Van Canneyt 2 years ago
parent
commit
9e7110e244

+ 21 - 21
packages/oracle/examples/oraclew.pp

@@ -25,17 +25,17 @@ uses OCI, oratypes,Classes, SysUtils;
 
     procedure OraInit;
     procedure OraFin;
-    procedure OraLogin(name, pass, server: string);
+    procedure OraLogin(name, pass, server: AnsiString);
     procedure OraLogout;
-    procedure OraSQLExec(sql: string);
-    function OraGetFieldAsString(pos : integer) : string;
+    procedure OraSQLExec(sql: AnsiString);
+    function OraGetFieldAsString(pos : integer) : AnsiString;
     function OraGetFieldAsInteger(pos : integer) : longint;
     function OraNext: boolean;
     function OraGetFieldCount: integer;
-    function OraGetFieldName(pos : integer) : string;
+    function OraGetFieldName(pos : integer) : AnsiString;
     function OraGetFieldType(pos : integer) : longint;
     function IsFieldDate(Pos : integer): boolean;
-    procedure OraError(errcode: integer; err: POCIError; msg : string);
+    procedure OraError(errcode: integer; err: POCIError; msg : AnsiString);
 
 const
     cDescribeBuf = 1024;
@@ -48,7 +48,7 @@ type
   TDescribeRec = record
     dbsize      : sb4;
     dbtype      : sb2;
-    buf         : array [0..cDescribeBuf] of char;
+    buf         : array [0..cDescribeBuf] of AnsiChar;
     buflen      : sb4;
     dsize       : sb4;
     precision   : sb2;
@@ -56,7 +56,7 @@ type
     nullok      : sb2;
 
     // Define part
-      valbuf    : array [0..cDescribeBuf] of char;
+      valbuf    : array [0..cDescribeBuf] of AnsiChar;
       flt_buf   : double;
       int_buf   : cardinal;
       int64_buf : int64;
@@ -76,18 +76,18 @@ var
 
 implementation
 
-  function DecodeDataType(dtype : longint): string;
+  function DecodeDataType(dtype : longint): AnsiString;
   begin
     case dtype of
-        SQLT_CHR : DecodeDataType := '(ORANET TYPE) character string';
+        SQLT_CHR : DecodeDataType := '(ORANET TYPE) character AnsiString';
         SQLT_NUM : DecodeDataType := '(ORANET TYPE) oracle numeric';
         SQLT_INT : DecodeDataType := '(ORANET TYPE) integer';
         SQLT_FLT : DecodeDataType := '(ORANET TYPE) Floating point number';
-        SQLT_STR : DecodeDataType := 'zero terminated string';
+        SQLT_STR : DecodeDataType := 'zero terminated AnsiString';
         SQLT_VNU : DecodeDataType := 'NUM with preceding length byte';
         SQLT_PDN : DecodeDataType := '(ORANET TYPE) Packed Decimal Numeric';
         SQLT_LNG : DecodeDataType := 'long';
-        SQLT_VCS : DecodeDataType := 'Variable character string';
+        SQLT_VCS : DecodeDataType := 'Variable character AnsiString';
         SQLT_NON : DecodeDataType := 'Null/empty PCC Descriptor entry';
         SQLT_RID : DecodeDataType := 'rowid';
         SQLT_DAT : DecodeDataType := 'date in oracle format';
@@ -96,10 +96,10 @@ implementation
         SQLT_LBI : DecodeDataType := 'long binary';
         SQLT_UIN : DecodeDataType := 'unsigned integer';
         SQLT_SLS : DecodeDataType := 'Display sign leading separate';
-        SQLT_LVC : DecodeDataType := 'Longer longs (char)';
+        SQLT_LVC : DecodeDataType := 'Longer longs (AnsiChar)';
         SQLT_LVB : DecodeDataType := 'Longer long binary';
-        SQLT_AFC : DecodeDataType := 'Ansi fixed char';
-        SQLT_AVC : DecodeDataType := 'Ansi Var char';
+        SQLT_AFC : DecodeDataType := 'Ansi fixed AnsiChar';
+        SQLT_AVC : DecodeDataType := 'Ansi Var AnsiChar';
         SQLT_CUR : DecodeDataType := 'cursor  type';
         SQLT_RDD : DecodeDataType := 'rowid descriptor';
         SQLT_LAB : DecodeDataType := 'label type';
@@ -136,7 +136,7 @@ implementation
        var
         fldc    : longint;
         paramd  : POCIParam;
-        colname : PChar;
+        colname : PAnsiChar;
         colsize : ub4;
         Rec     : PDescribeRec;
        begin
@@ -229,9 +229,9 @@ implementation
         end;
     end;
 
-    procedure OraError( errcode : integer; err: POCIError; msg : string );
+    procedure OraError( errcode : integer; err: POCIError; msg : AnsiString );
     var
-        buff : array [0..1024] of char;
+        buff : array [0..1024] of AnsiChar;
 
     begin
         if err <> nil then
@@ -260,7 +260,7 @@ implementation
         if ecode <> 0 then OraError( ecode, nil, 'Error allocating statement handle');
     end;
 
-    procedure OraLogin(name, pass, server: string);
+    procedure OraLogin(name, pass, server: AnsiString);
     begin
         ecode := OCILogon(Env, Err, Svc, @name[1], Length(name),
             @pass[1], Length(pass), @server[1], Length(server));
@@ -280,7 +280,7 @@ implementation
         OCIHandleFree(Err, OCI_HTYPE_ERROR);
     end;
 
-    procedure OraSQLExec(sql: string);
+    procedure OraSQLExec(sql: AnsiString);
     var
         dtype: longint;
     begin
@@ -344,7 +344,7 @@ implementation
       Result := (Desc.dbtype = SQLT_DAT);
     end;
 
-    function OraGetFieldAsString(pos : integer) : string;
+    function OraGetFieldAsString(pos : integer) : AnsiString;
     var
         Desc : TDescribeRec;
     Date : array [0..6] of byte;
@@ -418,7 +418,7 @@ implementation
       OraGetFieldType := TDescribeRec(FieldList[pos-1]^).dbtype;
     end;
 
-    function OraGetFieldName(pos : integer) : string;
+    function OraGetFieldName(pos : integer) : AnsiString;
     begin
         if (Pos > FieldList.Count) or (Pos < 1) then
             Exit;

+ 2 - 2
packages/oracle/src/nzt.inc

@@ -808,9 +808,9 @@ var nztwOpenWallet : function (_para1:Pnzctx; _para2:ub4; _para3:Ptext; _para4:u
     }
 
 {$IFNDEF LinkDynamically}
-  function nztwRetrievePersonaCopyByName(_para1:Pnzctx; _para2:PnzttWallet; _para3:Pchar; _para4:PPnzttPersona):nzerror;cdecl;external ocilib name 'nztwRetrievePersonaCopyByName';
+  function nztwRetrievePersonaCopyByName(_para1:Pnzctx; _para2:PnzttWallet; _para3:PAnsiChar; _para4:PPnzttPersona):nzerror;cdecl;external ocilib name 'nztwRetrievePersonaCopyByName';
 {$ELSE}
-  nztwRetrievePersonaCopyByName : function (_para1:Pnzctx; _para2:PnzttWallet; _para3:Pchar; _para4:PPnzttPersona):nzerror;cdecl;
+  nztwRetrievePersonaCopyByName : function (_para1:Pnzctx; _para2:PnzttWallet; _para3:PAnsiChar; _para4:PPnzttPersona):nzerror;cdecl;
 {$ENDIF}
 
   {---------------------- nzteOpenPersona ---------------------- }

+ 4 - 4
packages/oracle/src/oci.inc

@@ -491,7 +491,7 @@ uses ctypes,
   const // forward declarations which aren't possible in pascal
   { Attach using server handle from pool  }
      OCI_CPOOL = $0200;
-  { char set id  }
+  { AnsiChar set id  }
      OCI_ATTR_NCHARSET_ID = 262;
 
 {$include ocidfn.inc}
@@ -1255,7 +1255,7 @@ uses ctypes,
      OCI_ATTR_DN_COUNT = 161;     
   { server DN attribute  }
      OCI_ATTR_SERVER_DN = 162;     
-  { max char size of data  }
+  { max AnsiChar size of data  }
      OCI_ATTR_MAXCHAR_SIZE = 163;     
   { for scrollable result sets }
      OCI_ATTR_CURRENT_POSITION = 164;     
@@ -2240,9 +2240,9 @@ uses ctypes,
      OCI_ATTR_IS_OVERRIDING_METHOD = 283;     
   { Describe the base object  }
      OCI_ATTR_DESC_SYNBASE = 284;     
-  { char length semantics  }
+  { AnsiChar length semantics  }
      OCI_ATTR_CHAR_USED = 285;     
-  { char length  }
+  { AnsiChar length  }
      OCI_ATTR_CHAR_SIZE = 286;     
   { SQLJ support  }
   { is java implemented type ?  }

+ 1 - 1
packages/oracle/src/ociap.inc

@@ -8829,7 +8829,7 @@ var OCIInitialize : function (mode:ub4; ctxp:Pdvoid; malocfp:tmalocfp; ralocfp:t
        OCIWideCharStrCaseConversion - convert a wchar string into lowercase or
                                       uppercase
      REMARKS
-       This function convert the wide char string pointed to by wsrcstr into the
+       This function convert the wide AnsiChar string pointed to by wsrcstr into the
        uppercase or lowercase specified by flag and copies the result into the
        array pointed to by wdststr. The result string will be null-terminated.
      RETURNS

+ 6 - 6
packages/oracle/src/ocidfn.inc

@@ -256,13 +256,13 @@
      SQLT_UIN = 68;     
   { Display sign leading separate  }
      SQLT_SLS = 91;     
-  { Longer longs (char)  }
+  { Longer longs (AnsiChar)  }
      SQLT_LVC = 94;     
   { Longer long binary  }
      SQLT_LVB = 95;     
-  { Ansi fixed char  }
+  { Ansi fixed AnsiChar  }
      SQLT_AFC = 96;     
-  { Ansi Var char  }
+  { Ansi Var AnsiChar  }
      SQLT_AVC = 97;     
   { binary float canonical  }
      SQLT_IBFLOAT = 100;     
@@ -321,12 +321,12 @@
      SQLT_FILE = SQLT_BFILEE;     
      SQLT_CFILE = SQLT_CFILEE;     
      SQLT_BFILE = SQLT_BFILEE;     
-  { CHAR/NCHAR/VARCHAR2/NVARCHAR2/CLOB/NCLOB char set "form" information  }
-  { for CHAR, VARCHAR2, CLOB w/o a specified set  }
+  { AnsiChar/NCHAR/VARCHAR2/NVARCHAR2/CLOB/NCLOB AnsiChar set "form" information  }
+  { for AnsiChar, VARCHAR2, CLOB w/o a specified set  }
      SQLCS_IMPLICIT = 1;     
   { for NCHAR, NCHAR VARYING, NCLOB  }
      SQLCS_NCHAR = 2;     
-  { for CHAR, etc, with "CHARACTER SET ..." syntax  }
+  { for AnsiChar, etc, with "CHARACTER SET ..." syntax  }
      SQLCS_EXPLICIT = 3;     
   { for PL/SQL "flexible" parameters  }
      SQLCS_FLEXIBLE = 4;     

+ 36 - 36
packages/oracle/src/oraoci.pp

@@ -160,10 +160,10 @@ interface
      SQLT_LBI = 24;             { long binary  }
      SQLT_UIN = 68;             { unsigned integer  }
      SQLT_SLS = 91;             { Display sign leading separate  }
-     SQLT_LVC = 94;             { Longer longs (char)  }
+     SQLT_LVC = 94;             { Longer longs (AnsiChar)  }
      SQLT_LVB = 95;             { Longer long binary  }
-     SQLT_AFC = 96;             { Ansi fixed char  }
-     SQLT_AVC = 97;             { Ansi Var char  }
+     SQLT_AFC = 96;             { Ansi fixed AnsiChar  }
+     SQLT_AVC = 97;             { Ansi Var AnsiChar  }
      SQLT_CUR = 102;            { cursor  type  }
      SQLT_RDD = 104;            { rowid descriptor  }
      SQLT_LAB = 105;            { label type  }
@@ -184,10 +184,10 @@ interface
      SQLT_CFILE = SQLT_CFILEE;
      SQLT_BFILE = SQLT_BFILEE;
 
-     { CHAR/NCHAR/VARCHAR2/NVARCHAR2/CLOB/NCLOB char set "form" information  }
-     SQLCS_IMPLICIT = 1;        { for CHAR, VARCHAR2, CLOB w/o a specified set  }
+     { AnsiChar/NCHAR/VARCHAR2/NVARCHAR2/CLOB/NCLOB AnsiChar set "form" information  }
+     SQLCS_IMPLICIT = 1;        { for AnsiChar, VARCHAR2, CLOB w/o a specified set  }
      SQLCS_NCHAR = 2;           { for NCHAR, NCHAR VARYING, NCLOB  }
-     SQLCS_EXPLICIT = 3;        { for CHAR, etc, with "CHARACTER SET ..." syntax  }
+     SQLCS_EXPLICIT = 3;        { for AnsiChar, etc, with "CHARACTER SET ..." syntax  }
      SQLCS_FLEXIBLE = 4;        { for PL/SQL "flexible" parameters  }
      SQLCS_LIT_NULL = 5;        { for typecheck of NULL and empty_clob() lits  }
 
@@ -827,7 +827,7 @@ type
   function OCIServerAttach(
           srvhp:OCIServer;
           errhp:OCIError;
-          dblink:PChar;
+          dblink:PAnsiChar;
           dblink_len:longint;
           mode:cardinal):sword;cdecl;external;
 
@@ -853,11 +853,11 @@ type
           envhp:OCIEnv;
           errhp:OCIError;
           var svchp:OCISvcCtx;
-          username:PChar;
+          username:PAnsiChar;
           uname_len:cardinal;
-          password:PChar;
+          password:PAnsiChar;
           passwd_len:cardinal;
-          dbname:PChar;
+          dbname:PAnsiChar;
           dbname_len:cardinal):sword;cdecl;external;
 
   function OCILogoff(
@@ -867,27 +867,27 @@ type
   function OCIErrorGet(
           hndlp:pointer;
           recordno:cardinal;
-          sqlstate:PChar;
+          sqlstate:PAnsiChar;
           var errcodep:PLongint;
-          bufp:PChar;
+          bufp:PAnsiChar;
           bufsiz:cardinal;
           AType:cardinal):sword;cdecl;external;
 
   function OCIPasswordChange(
           svchp:OCISvcCtx;
           errhp:OCIError;
-          user_name:PChar;
+          user_name:PAnsiChar;
           usernm_len:cardinal;
-          opasswd:PChar;
+          opasswd:PAnsiChar;
           opasswd_len:cardinal;
-          npasswd:PChar;
+          npasswd:PAnsiChar;
           npasswd_len:cardinal;
           mode:cardinal):sword;cdecl;external;
 
   function OCIStmtPrepare(
           stmtp:OCIStmt;
           errhp:OCIError;
-          stmt:PChar;
+          stmt:PAnsiChar;
           stmt_len:cardinal;
           language:cardinal;
           mode:cardinal):sword;cdecl;external;
@@ -910,7 +910,7 @@ type
           stmtp:OCIStmt;
           bindp:OCIBind;
           errhp:OCIError;
-          placeholder:PChar;
+          placeholder:PAnsiChar;
           placeh_len:longint;
           valuep:pointer;
           value_sz:longint;
@@ -1026,9 +1026,9 @@ type
           size:cardinal;
           startloc:cardinal;
           found:plongint;
-          bvnp:PChar;
+          bvnp:PAnsiChar;
           bvnl:byte;
-          invp:PChar;
+          invp:PAnsiChar;
           inpl:byte;
           dupl:byte;
           hndl:OCIBind):sword;cdecl;external;
@@ -1158,9 +1158,9 @@ type
           envhp:OCIEnv;
           errhp:OCIError;
           filep:OCILobLocator;
-          dir_alias:PChar;
+          dir_alias:PAnsiChar;
           d_length:pword;
-          filename:PChar;
+          filename:PAnsiChar;
           f_length:pword):sword;cdecl;external;
 
   function OCILobFileIsOpen(
@@ -1179,9 +1179,9 @@ type
           envhp:OCIEnv;
           errhp:OCIError;
           filepp:OCILobLocator;
-          dir_alias:PChar;
+          dir_alias:PAnsiChar;
           d_length:word;
-          filename:PChar;
+          filename:PAnsiChar;
           f_length:word):sword;cdecl;external;
 
   function OCILobFlushBuffer(
@@ -1261,7 +1261,7 @@ type
   function OCIServerVersion(
           hndlp:pointer;
           errhp:OCIError;
-          bufp:PChar;
+          bufp:PAnsiChar;
           bufsz:cardinal;
           hndltype:byte):sword;cdecl;external;
 
@@ -1298,12 +1298,12 @@ type
   function OCIDateToText(
       err:OCIError;
           date:POCIDate;
-          fmt:PChar;
+          fmt:PAnsiChar;
           fmt_length:ub1;
-          lang_name:PChar;
+          lang_name:PAnsiChar;
       lang_length:ub4;
           buf_size:PCardinal;
-          buf:PChar):sword;cdecl;external;
+          buf:PAnsiChar):sword;cdecl;external;
 
   {-------------------------------------------------------------------------------------------}
   { Security Package                                                                          }
@@ -1313,16 +1313,16 @@ type
 
   function OCISecurityTerminate(sechandle:pOCISecurity; error_handle:OCIError):sword;cdecl;
 
-  function OCISecurityOpenWallet(osshandle:pOCISecurity; error_handle:OCIError; wrllen:size_t; wallet_resource_locator:PChar; pwdlen:size_t;
-             password:PChar; wallet:pnzttWallet):sword;cdecl;
+  function OCISecurityOpenWallet(osshandle:pOCISecurity; error_handle:OCIError; wrllen:size_t; wallet_resource_locator:PAnsiChar; pwdlen:size_t;
+             password:PAnsiChar; wallet:pnzttWallet):sword;cdecl;
 
   function OCISecurityCloseWallet(osshandle:pOCISecurity; error_handle:OCIError; wallet:pnzttWallet):sword;cdecl;
 
-  function OCISecurityCreateWallet(osshandle:pOCISecurity; error_handle:OCIError; wrllen:size_t; wallet_resource_locator:PChar; pwdlen:size_t;
-             password:PChar; wallet:pnzttWallet):sword;cdecl;
+  function OCISecurityCreateWallet(osshandle:pOCISecurity; error_handle:OCIError; wrllen:size_t; wallet_resource_locator:PAnsiChar; pwdlen:size_t;
+             password:PAnsiChar; wallet:pnzttWallet):sword;cdecl;
 
-  function OCISecurityDestroyWallet(osshandle:pOCISecurity; error_handle:OCIError; wrllen:size_t; wallet_resource_locator:PChar; pwdlen:size_t;
-             password:PChar):sword;cdecl;
+  function OCISecurityDestroyWallet(osshandle:pOCISecurity; error_handle:OCIError; wrllen:size_t; wallet_resource_locator:PAnsiChar; pwdlen:size_t;
+             password:PAnsiChar):sword;cdecl;
 
   function OCISecurityStorePersona(osshandle:pOCISecurity; error_handle:OCIError; persona:ppnzttPersona; wallet:pnzttWallet):sword;cdecl;
 
@@ -1418,12 +1418,12 @@ type
   function OCISecuritySetBlock(osshandle:pOCISecurity; error_handle:OCIError; flags_to_set:uword; buffer_length:size_t; used_buffer_length:size_t;
              buffer:pbyte; buffer_block:pnzttBufferBlock):sword;cdecl;
 
-  function OCISecurityGetIdentity(osshandle:pOCISecurity; error_handle:OCIError; namelen:size_t; distinguished_name:PChar; identity:ppnzttIdentity):sword;cdecl;
+  function OCISecurityGetIdentity(osshandle:pOCISecurity; error_handle:OCIError; namelen:size_t; distinguished_name:PAnsiChar; identity:ppnzttIdentity):sword;cdecl;
 
-  function OCIAQEnq(svchp:OCISvcCtx; errhp:OCIError; queue_name:PChar; enqopt:pOCIAQEnqOptions; msgprop:pOCIAQMsgProperties;
+  function OCIAQEnq(svchp:OCISvcCtx; errhp:OCIError; queue_name:PAnsiChar; enqopt:pOCIAQEnqOptions; msgprop:pOCIAQMsgProperties;
              payload_tdo:pOCIType; payload:ppointer; payload_ind:ppointer; msgid:ppOCIRaw; flags:cardinal):sword;cdecl;
 
-  function OCIAQDeq(svchp:OCISvcCtx; errhp:OCIError; queue_name:PChar; deqopt:pOCIAQDeqOptions; msgprop:pOCIAQMsgProperties;
+  function OCIAQDeq(svchp:OCISvcCtx; errhp:OCIError; queue_name:PAnsiChar; deqopt:pOCIAQDeqOptions; msgprop:pOCIAQMsgProperties;
              payload_tdo:pOCIType; payload:ppointer; payload_ind:ppointer; msgid:ppOCIRaw; flags:cardinal):sword;cdecl;
 }
 

+ 2 - 2
packages/oracle/src/oratypes.pp

@@ -60,7 +60,7 @@ interface
      sb1 = shortint;
 
      Peb1 = ^eb1;
-     eb1 = char;
+     eb1 = AnsiChar;
 
   const
      UB1MAXVAL:ub1 = 255;
@@ -197,7 +197,7 @@ interface
 
   type
      Poratext = ^oratext;
-     oratext = char;
+     oratext = AnsiChar;
 
 
   type

+ 5 - 5
packages/oracle/src/orl.inc

@@ -267,7 +267,7 @@
       cxcheng    10/09/96 -  more lint fixes
       skrishna   10/09/96 -  continue beautification
       cxcheng    10/09/96 -  more fixes
-      skrishna   10/09/96 -  change fixed-char rep. to orlvstr*
+      skrishna   10/09/96 -  change fixed-AnsiChar rep. to orlvstr*
       jwijaya    10/08/96 -  continue beautification
       jwijaya    10/07/96 -  beautify
       cxcheng    10/07/96 -  more changes
@@ -507,7 +507,7 @@
        int     inum;
        double  dnum;
        OCINumber ornum;
-       char    buffer[21];
+       AnsiChar    buffer[21];
        ub4     buflen;
        sword   result;
        
@@ -1862,7 +1862,7 @@ var OCINumberToInt : function (err:POCIError; number:POCINumber; rsl_length:uwor
          /o error handling code o/
   
        /o convert date for display purposes o/
-       char str[100];
+       AnsiChar str[100];
        ub4 strlen = sizeof(str);
        if (OCIDateToText(err, &joe->start_date, FMT, sizeof(FMT)-1, LANG,
                   sizeof(LANG)-1, &strlen, str) != OCI_SUCCESS)
@@ -2410,10 +2410,10 @@ var OCIDateCheck : function(err:POCIError; date:POCIDate; valid:Puword):sword;cd
               <to be discovered>
       }
     {*************************************************************************** }
-    {                  FIXED-LENGTH STRING - CHAR (N)                            }
+    {                  FIXED-LENGTH STRING - AnsiChar (N)                            }
     {*************************************************************************** }
     {
-     * An ADT attribute declared as "x CHAR(n)" is mapped to "OCIString *x;".
+     * An ADT attribute declared as "x AnsiChar(n)" is mapped to "OCIString *x;".
      * The representation of OCIString * is shown below.
       }
     {*************************************************************************** }

+ 2 - 2
packages/oracle/src/oro_interface.inc

@@ -114,7 +114,7 @@
       cxcheng    10/02/96 -  move oronsp to ko.h as konsp
       cxcheng    10/01/96 -  add long names for readability
       cxcheng    10/01/96 -  remove orotty and orotal
-      rjenkins   09/28/96 -  2k char 4k varchar2
+      rjenkins   09/28/96 -  2k AnsiChar 4k varchar2
       jboonleu   09/27/96 -  add macro used only in beta2
       cxcheng    09/27/96 -  move oroenv to oroenv.h
       cxcheng    09/24/96 -  remove unnecessary orotyp
@@ -712,7 +712,7 @@
      OCI_TYPECODE_PTR = 32;
      OCI_TYPECODE_VARCHAR2 = SQLT_VCS;
   { SQL VARCHAR2(N)  OTS SQL_VARCHAR2(N)  }
-  { SQL CHAR(N)  OTS SQL_CHAR(N)  }
+  { SQL AnsiChar(N)  OTS SQL_CHAR(N)  }
      OCI_TYPECODE_CHAR = SQLT_AFC;
      OCI_TYPECODE_VARCHAR = SQLT_CHR;
   { SQL VARCHAR(N)  OTS SQL_VARCHAR(N)  }

+ 2 - 2
packages/oracle/src/ort.inc

@@ -1517,9 +1517,9 @@ var OCITypeIterNew : function (env:POCIEnv; err:POCIError; tdo:POCIType; var ite
           Get the character form of a fixed or variable length string type.
           The character form is an enumerated value that can be one of the
           4 values below:
-                 SQLCS_IMPLICIT for CHAR, VARCHAR2, CLOB w/o a specified set
+                 SQLCS_IMPLICIT for AnsiChar, VARCHAR2, CLOB w/o a specified set
                  SQLCS_NCHAR    for NCHAR, NCHAR VARYING, NCLOB
-                 SQLCS_EXPLICIT for CHAR, etc, with "CHARACTER SET ..." syntax
+                 SQLCS_EXPLICIT for AnsiChar, etc, with "CHARACTER SET ..." syntax
                  SQLCS_FLEXIBLE for PL/SQL "flexible" parameters
      RETURNS:
           character form of the fixed or variable string