From 6ed045a911d68093852887002425f487de78d86a Mon Sep 17 00:00:00 2001 From: marco <marco@freepascal.org> Date: Sat, 6 May 2017 18:47:50 +0000 Subject: [PATCH] * encoding strings now CONST, minor optimization from mantis 028117 git-svn-id: trunk@36139 - --- packages/iconvenc/src/iconvenc.pas | 2 +- packages/iconvenc/src/iconvenc_dyn.pas | 2 +- packages/iconvenc/src/iconvert.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/iconvenc/src/iconvenc.pas b/packages/iconvenc/src/iconvenc.pas index e0aac343c5..9780ac7d78 100644 --- a/packages/iconvenc/src/iconvenc.pas +++ b/packages/iconvenc/src/iconvenc.pas @@ -72,7 +72,7 @@ function iconv_close (__cd: iconv_t): cint; cdecl; external libiconvname name ic var IconvLibFound: boolean = False; -function Iconvert(s: string; var res: string; FromEncoding, ToEncoding: string): cint; +function Iconvert(s: string; var res: string; const FromEncoding, ToEncoding: string): cint; function InitIconv(var error: string): boolean; implementation diff --git a/packages/iconvenc/src/iconvenc_dyn.pas b/packages/iconvenc/src/iconvenc_dyn.pas index 57aad86c11..a97927d0ba 100644 --- a/packages/iconvenc/src/iconvenc_dyn.pas +++ b/packages/iconvenc/src/iconvenc_dyn.pas @@ -47,7 +47,7 @@ var IconvLibFound: boolean = False; function TryLoadLib(LibName: string; var error: string): boolean; // can be used to load non standard libname -function Iconvert(s: string; var res: string; FromEncoding, ToEncoding: string): cint; +function Iconvert(s: string; var res: string; const FromEncoding, ToEncoding: string): cint; function InitIconv(var error: string): boolean; implementation diff --git a/packages/iconvenc/src/iconvert.inc b/packages/iconvenc/src/iconvert.inc index 8707b123b2..d4428a8cf6 100644 --- a/packages/iconvenc/src/iconvert.inc +++ b/packages/iconvenc/src/iconvert.inc @@ -3,7 +3,7 @@ {$define noerrnoiconv} {$endif} -function Iconvert(S: string; var Res: string; FromEncoding, ToEncoding: string): cint; +function Iconvert(S: string; var Res: string; const FromEncoding, ToEncoding: string): cint; var InLen, OutLen, Offset: size_t; Src, Dst: pchar;