ソースを参照

iconv finalization fixed

Alexander Shiryaev 12 年 前
コミット
8133fe6cd3

BIN
BlackBox/_Linux_/Host/Mod/Console.odc


+ 2 - 2
BlackBox/_Linux_/Host/Mod/Console.txt

@@ -145,8 +145,8 @@ MODULE HostConsole;
 	PROCEDURE Close;
 		VAR res: INTEGER;
 	BEGIN
-		IF e # -1 THEN res := Iconv.iconv_close(e) END;
-		IF d # -1 THEN res := Iconv.iconv_close(d) END
+		IF e # -1 THEN res := Iconv.iconv_close(e); e := -1 END;
+		IF d # -1 THEN res := Iconv.iconv_close(d); d := -1 END
 	END Close;
 
 BEGIN

BIN
BlackBox/_Linux_/Host/Mod/Files.odc


+ 13 - 0
BlackBox/_Linux_/Host/Mod/Files.txt

@@ -208,6 +208,17 @@ MODULE HostFiles;
 		END
 	END InitConv;
 
+	PROCEDURE CloseConv;
+		VAR res: INTEGER;
+	BEGIN
+		IF e # -1 THEN
+			res := Iconv.iconv_close(e); e := -1
+		END;
+		IF d # -1 THEN
+			res := Iconv.iconv_close(d); d := -1
+		END
+	END CloseConv;
+
 	PROCEDURE Short (IN f: FullName; OUT t: ShortName; OUT ok: BOOLEAN);
 		VAR fR, fLen, tLen: INTEGER;
 			from: Iconv.PtrLSTR; to: Iconv.PtrSTR; res: Iconv.size_t;
@@ -1480,4 +1491,6 @@ MODULE HostFiles;
 
 BEGIN
 	Init
+CLOSE
+	CloseConv
 END HostFiles.

BIN
BlackBox/_Linux_/libBB.so


BIN
BlackBox/_Linux_/libBB0.so


BIN
BlackBox/_OpenBSD_/Host/Mod/Console.odc


+ 3 - 3
BlackBox/_OpenBSD_/Host/Mod/Console.txt

@@ -1,6 +1,6 @@
 MODULE HostConsole;
 
-	(* THIS IS TEXT COPY OF Console.odc *)
+	(* THIS IS TEXT COPY OF Console.od *)
 	(* DO NOT EDIT *)
 
 	IMPORT SYSTEM, Console, Libc := LinLibc, Iconv := LinIconv, HostLang, Kernel;
@@ -145,8 +145,8 @@ MODULE HostConsole;
 	PROCEDURE Close;
 		VAR res: INTEGER;
 	BEGIN
-		IF e # -1 THEN res := Iconv.iconv_close(e) END;
-		IF d # -1 THEN res := Iconv.iconv_close(d) END
+		IF e # -1 THEN res := Iconv.iconv_close(e); e := -1 END;
+		IF d # -1 THEN res := Iconv.iconv_close(d); d := -1 END
 	END Close;
 
 BEGIN

BIN
BlackBox/_OpenBSD_/Host/Mod/Files.odc


+ 13 - 0
BlackBox/_OpenBSD_/Host/Mod/Files.txt

@@ -208,6 +208,17 @@ MODULE HostFiles;
 		END
 	END InitConv;
 
+	PROCEDURE CloseConv;
+		VAR res: INTEGER;
+	BEGIN
+		IF e # -1 THEN
+			res := Iconv.iconv_close(e); e := -1
+		END;
+		IF d # -1 THEN
+			res := Iconv.iconv_close(d); d := -1
+		END
+	END CloseConv;
+
 	PROCEDURE Short (IN f: FullName; OUT t: ShortName; OUT ok: BOOLEAN);
 		VAR fR, fLen, tLen: INTEGER;
 			from: Iconv.PtrLSTR; to: Iconv.PtrSTR; res: Iconv.size_t;
@@ -1480,4 +1491,6 @@ MODULE HostFiles;
 
 BEGIN
 	Init
+CLOSE
+	CloseConv
 END HostFiles.

BIN
BlackBox/_OpenBSD_/libBB.so


BIN
BlackBox/_OpenBSD_/libBB0.so