Skip to content

Commit f537eb2

Browse files
committed
Clean up compiler complaints (issue #7)
1 parent 660f278 commit f537eb2

22 files changed

+452
-474
lines changed

src/bindings/adabase-bindings-postgresql.ads

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
-- http://forge.ada-ru.org/matreshka
66
-- Used with permission from Vadim Godunko <[email protected]>
77

8-
with System;
98
with Interfaces.C.Strings;
109

1110
package AdaBase.Bindings.PostgreSQL is

src/connections/adabase-connection-base-mysql.adb

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -302,28 +302,28 @@ package body AdaBase.Connection.Base.MySQL is
302302

303303
declare
304304
-- populate client version information
305-
result : ABM.my_ulong := ABM.mysql_get_client_version;
305+
result : constant ABM.my_ulong := ABM.mysql_get_client_version;
306306
begin
307307
conn.info_client_version := convert_version (Positive (result));
308308
end;
309309

310310
declare
311311
-- populate client information
312-
result : ABM.ICS.chars_ptr := ABM.mysql_get_client_info;
312+
result : constant ABM.ICS.chars_ptr := ABM.mysql_get_client_info;
313313
begin
314314
conn.info_client := CT.SUS (ABM.ICS.Value (Item => result));
315315
end;
316316

317317
declare
318318
-- populate server version information
319-
result : ABM.my_ulong := ABM.mysql_get_server_version (conn.handle);
319+
result : constant ABM.my_ulong := ABM.mysql_get_server_version (conn.handle);
320320
begin
321321
conn.info_server_version := convert_version (Positive (result));
322322
end;
323323

324324
declare
325325
-- populate server information
326-
result : ABM.ICS.chars_ptr := ABM.mysql_get_server_info (conn.handle);
326+
result : constant ABM.ICS.chars_ptr := ABM.mysql_get_server_info (conn.handle);
327327
begin
328328
conn.info_server := CT.SUS (ABM.ICS.Value (Item => result));
329329
end;
@@ -394,7 +394,6 @@ package body AdaBase.Connection.Base.MySQL is
394394
procedure setTransactionIsolation (conn : out MySQL_Connection;
395395
isolation : Trax_Isolation)
396396
is
397-
use type Trax_Isolation;
398397
sql : constant String := "SET SESSION TRANSACTION ISOLATION LEVEL " &
399398
ISO_Keywords (isolation);
400399
begin
@@ -644,7 +643,6 @@ package body AdaBase.Connection.Base.MySQL is
644643
ABM.MYSQL_TYPE_VAR_STRING |
645644
ABM.MYSQL_TYPE_STRING =>
646645
declare
647-
use type ABM.MY_CHARSET_INFO;
648646
chsetnr : constant Natural := Natural (field.charsetnr);
649647
bin_set : constant Natural := 63;
650648
binary : constant Boolean := (chsetnr = bin_set);
@@ -770,7 +768,7 @@ package body AdaBase.Connection.Base.MySQL is
770768

771769
result : fldlen (1 .. num_columns) := (others => 0);
772770
naccess : cres_access;
773-
MLA : ABM.my_ulong_access := ABM.mysql_fetch_lengths
771+
MLA : constant ABM.my_ulong_access := ABM.mysql_fetch_lengths
774772
(result => result_handle);
775773

776774
begin
@@ -1111,8 +1109,8 @@ package body AdaBase.Connection.Base.MySQL is
11111109
procedure establish_uniform_encoding (conn : out MySQL_Connection)
11121110
is
11131111
use type ABM.my_int;
1114-
result : ABM.my_int;
1115-
charset : String := CT.USS (conn.character_set);
1112+
result : ABM.my_int;
1113+
charset : constant String := CT.USS (conn.character_set);
11161114
csname : ABM.ICS.chars_ptr := ABM.ICS.New_String (charset);
11171115
begin
11181116
if conn.prop_active then
@@ -1153,9 +1151,9 @@ package body AdaBase.Connection.Base.MySQL is
11531151
if conn.prop_active then
11541152
-- conn.dummy := True;
11551153
declare
1156-
set : ABM.ICS.chars_ptr :=
1154+
set : constant ABM.ICS.chars_ptr :=
11571155
ABM.mysql_character_set_name (handle => conn.handle);
1158-
setstr : String := ABM.ICS.Value (Item => set);
1156+
setstr : constant String := ABM.ICS.Value (Item => set);
11591157
begin
11601158
return ACH.To_Upper (setstr);
11611159
end;
@@ -1170,8 +1168,8 @@ package body AdaBase.Connection.Base.MySQL is
11701168
---------------------------------
11711169
procedure retrieve_uniform_encoding (conn : out MySQL_Connection)
11721170
is
1173-
charset : String := character_set (conn => conn);
1174-
charsetuc : String := ACH.To_Upper (charset);
1171+
charset : constant String := character_set (conn => conn);
1172+
charsetuc : constant String := ACH.To_Upper (charset);
11751173
begin
11761174
conn.encoding_is_utf8 := (charsetuc = "UTF8");
11771175
conn.character_set := CT.SUS (charset);

0 commit comments

Comments
 (0)