aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libsndfile-commands.adb77
-rw-r--r--src/libsndfile-virtual.adb12
-rw-r--r--src/libsndfile.adb17
-rw-r--r--src/libsndfile.ads7
4 files changed, 53 insertions, 60 deletions
diff --git a/src/libsndfile-commands.adb b/src/libsndfile-commands.adb
index 1939cd7..5338a7b 100644
--- a/src/libsndfile-commands.adb
+++ b/src/libsndfile-commands.adb
@@ -9,9 +9,8 @@ pragma Ada_2012;
with
- Ada.Assertions,
Ada.Strings.Fixed,
- Interfaces.C.Strings;
+ Interfaces.C;
use type
@@ -302,7 +301,7 @@ package body Libsndfile.Commands is
(Info : in Format_Info)
return Major_Format
is
- Raw : Interfaces.Unsigned_32 :=
+ Raw : constant Interfaces.Unsigned_32 :=
Interfaces.Unsigned_32 (Info.C_Data.My_Format) and sf_format_typemask;
begin
return To_Major (Interfaces.C.int (Raw));
@@ -312,7 +311,7 @@ package body Libsndfile.Commands is
(Info : in Format_Info)
return Minor_Format
is
- Raw : Interfaces.Unsigned_32 :=
+ Raw : constant Interfaces.Unsigned_32 :=
Interfaces.Unsigned_32 (Info.C_Data.My_Format) and sf_format_submask;
begin
return To_Minor (Interfaces.C.int (Raw));
@@ -322,7 +321,7 @@ package body Libsndfile.Commands is
(Info : in Format_Info)
return Endianness
is
- Raw : Interfaces.Unsigned_32 :=
+ Raw : constant Interfaces.Unsigned_32 :=
Interfaces.Unsigned_32 (Info.C_Data.My_Format) and sf_format_endmask;
begin
return To_Endian (Interfaces.C.int (Raw));
@@ -496,7 +495,6 @@ package body Libsndfile.Commands is
Result : Long_Float_Array (1 .. Natural (File.Chans));
Code : Interfaces.C.int;
begin
- Ada.Assertions.Assert (Long_Float'Size = Interfaces.C.double'Size);
Code := sf_command
(File.Ptr,
sfc_calc_max_all_channels,
@@ -517,7 +515,6 @@ package body Libsndfile.Commands is
Result : Long_Float_Array (1 .. Natural (File.Chans));
Code : Interfaces.C.int;
begin
- Ada.Assertions.Assert (Long_Float'Size = Interfaces.C.double'Size);
Code := sf_command
(File.Ptr,
sfc_calc_norm_max_all_channels,
@@ -577,26 +574,26 @@ package body Libsndfile.Commands is
(File : in Sound_File;
Value : in Boolean)
is
- Code : Interfaces.C.int;
- begin
- Code := sf_command
+ Ignore : Interfaces.C.int := sf_command
(File.Ptr,
sfc_set_norm_float,
Null_Pointer,
(if Value then sf_true else sf_false));
+ begin
+ null;
end Set_Normed_Float;
procedure Set_Normed_Double
(File : in Sound_File;
Value : in Boolean)
is
- Code : Interfaces.C.int;
- begin
- Code := sf_command
+ Ignore : Interfaces.C.int := sf_command
(File.Ptr,
sfc_set_norm_double,
Null_Pointer,
(if Value then sf_true else sf_false));
+ begin
+ null;
end Set_Normed_Double;
function Get_Normed_Float
@@ -643,34 +640,34 @@ package body Libsndfile.Commands is
(File : in Sound_File;
Value : in Boolean)
is
- Code : Interfaces.C.int;
- begin
- Code := sf_command
+ Ignore : Interfaces.C.int := sf_command
(File.Ptr,
sfc_set_scale_float_int_read,
Null_Pointer,
(if Value then sf_true else sf_false));
+ begin
+ null;
end Set_Scale_Float_Integer_Read;
procedure Set_Scale_Integer_Float_Write
(File : in Sound_File;
Value : in Boolean)
is
- Code : Interfaces.C.int;
- begin
- Code := sf_command
+ Ignore : Interfaces.C.int := sf_command
(File.Ptr,
sfc_set_scale_int_float_write,
Null_Pointer,
(if Value then sf_true else sf_false));
+ begin
+ null;
end Set_Scale_Integer_Float_Write;
function Get_Simple_Format_Count
return Natural
is
- Result, Code : Interfaces.C.int;
+ Result, Ignore : Interfaces.C.int;
begin
- Code := sf_command
+ Ignore := sf_command
(Null_Pointer,
sfc_get_simple_format_count,
Storage.To_Integer (Result'Address),
@@ -743,9 +740,9 @@ package body Libsndfile.Commands is
function Get_Format_Major_Count
return Natural
is
- Result, Code : Interfaces.C.int;
+ Result, Ignore : Interfaces.C.int;
begin
- Code := sf_command
+ Ignore := sf_command
(Null_Pointer,
sfc_get_format_major_count,
Storage.To_Integer (Result'Address),
@@ -778,9 +775,9 @@ package body Libsndfile.Commands is
function Get_Format_Subtype_Count
return Natural
is
- Result, Code : Interfaces.C.int;
+ Result, Ignore : Interfaces.C.int;
begin
- Code := sf_command
+ Ignore := sf_command
(Null_Pointer,
sfc_get_format_subtype_count,
Storage.To_Integer (Result'Address),
@@ -814,38 +811,38 @@ package body Libsndfile.Commands is
(File : in Sound_File;
Value : in Boolean)
is
- Code : Interfaces.C.int;
- begin
- Code := sf_command
+ Ignore : Interfaces.C.int := sf_command
(File.Ptr,
sfc_set_add_peak_chunk,
Null_Pointer,
(if Value then sf_true else sf_false));
+ begin
+ null;
end Set_Add_Peak_Chunk;
procedure Update_Header_Now
(File : in Sound_File)
is
- Code : Interfaces.C.int;
- begin
- Code := sf_command
+ Ignore : Interfaces.C.int := sf_command
(File.Ptr,
sfc_update_header_now,
Null_Pointer,
0);
+ begin
+ null;
end Update_Header_Now;
procedure Set_Update_Header_Auto
(File : in Sound_File;
Value : in Boolean)
is
- Code : Interfaces.C.int;
- begin
- Code := sf_command
+ Ignore : Interfaces.C.int := sf_command
(File.Ptr,
sfc_set_update_header_auto,
Null_Pointer,
(if Value then sf_true else sf_false));
+ begin
+ null;
end Set_Update_Header_Auto;
procedure File_Truncate
@@ -876,13 +873,13 @@ package body Libsndfile.Commands is
(File : in Sound_File;
Value : in Boolean)
is
- Code : Interfaces.C.int;
- begin
- Code := sf_command
+ Ignore : Interfaces.C.int := sf_command
(File.Ptr,
sfc_set_clipping,
Null_Pointer,
(if Value then sf_true else sf_false));
+ begin
+ null;
end Set_Clipping;
function Get_Clipping
@@ -1441,13 +1438,13 @@ package body Libsndfile.Commands is
(File : in Sound_File;
Value : in Boolean)
is
- Code : Interfaces.C.int;
- begin
- Code := sf_command
+ Ignore : Interfaces.C.int := sf_command
(File.Ptr,
sfc_rf64_auto_downgrade,
Null_Pointer,
(if Value then sf_true else sf_false));
+ begin
+ null;
end RF64_Auto_Downgrade;
function Get_Original_Samplerate
diff --git a/src/libsndfile-virtual.adb b/src/libsndfile-virtual.adb
index 8a54837..1aae30b 100644
--- a/src/libsndfile-virtual.adb
+++ b/src/libsndfile-virtual.adb
@@ -47,7 +47,7 @@ package body Libsndfile.Virtual is
(Data : in Storage.Integer_Address)
return Interfaces.Integer_64
is
- Virtual : Virt_Conversions.Object_Pointer :=
+ Virtual : constant Virt_Conversions.Object_Pointer :=
Virt_Conversions.To_Pointer (Storage.To_Address (Data));
begin
return Interfaces.Integer_64 (Virtual.My_Length.all);
@@ -60,7 +60,7 @@ package body Libsndfile.Virtual is
Data : in Storage.Integer_Address)
return Interfaces.Integer_64
is
- Virtual : Virt_Conversions.Object_Pointer :=
+ Virtual : constant Virt_Conversions.Object_Pointer :=
Virt_Conversions.To_Pointer (Storage.To_Address (Data));
My_Whence : Seek_From;
begin
@@ -83,7 +83,7 @@ package body Libsndfile.Virtual is
Data : in Storage.Integer_Address)
return Interfaces.Integer_64
is
- Virtual : Virt_Conversions.Object_Pointer :=
+ Virtual : constant Virt_Conversions.Object_Pointer :=
Virt_Conversions.To_Pointer (Storage.To_Address (Data));
Buffer : Raw_Data (1 .. Integer (Count));
for Buffer'Address use Storage.To_Address (Ptr);
@@ -99,7 +99,7 @@ package body Libsndfile.Virtual is
Data : in Storage.Integer_Address)
return Interfaces.Integer_64
is
- Virtual : Virt_Conversions.Object_Pointer :=
+ Virtual : constant Virt_Conversions.Object_Pointer :=
Virt_Conversions.To_Pointer (Storage.To_Address (Data));
Buffer : Raw_Data (1 .. Integer (Count));
for Buffer'Address use Storage.To_Address (Ptr);
@@ -113,7 +113,7 @@ package body Libsndfile.Virtual is
(Data : in Storage.Integer_Address)
return Interfaces.Integer_64
is
- Virtual : Virt_Conversions.Object_Pointer :=
+ Virtual : constant Virt_Conversions.Object_Pointer :=
Virt_Conversions.To_Pointer (Storage.To_Address (Data));
begin
return Interfaces.Integer_64 (Virtual.My_Tell.all);
@@ -136,7 +136,7 @@ package body Libsndfile.Virtual is
Write : in Write_Function;
Tell : in Tell_Function)
is
- Mode_Int : Interfaces.C.int := (case Mode is
+ Mode_Int : constant Interfaces.C.int := (case Mode is
when Read_Only => sfm_read,
when Write_Only => sfm_write,
when Read_Write => sfm_rdwr);
diff --git a/src/libsndfile.adb b/src/libsndfile.adb
index 7cc9837..80f1d96 100644
--- a/src/libsndfile.adb
+++ b/src/libsndfile.adb
@@ -9,7 +9,6 @@ pragma Ada_2012;
with
- Ada.Assertions,
Interfaces.C.Strings;
use type
@@ -800,7 +799,7 @@ package body Libsndfile is
Mode : in File_Mode;
Info : in out File_Info'Class)
is
- Mode_Int : Interfaces.C.int := (case Mode is
+ Mode_Int : constant Interfaces.C.int := (case Mode is
when Read_Only => sfm_read,
when Write_Only => sfm_write,
when Read_Write => sfm_rdwr);
@@ -821,7 +820,7 @@ package body Libsndfile is
(Info : in File_Info)
return Boolean
is
- Result : Interfaces.C.int := asf_format_check (Info.Data);
+ Result : constant Interfaces.C.int := asf_format_check (Info.Data);
begin
if Result = sf_true then
return True;
@@ -893,7 +892,6 @@ package body Libsndfile is
for Buffer'Address use Data'Address;
pragma Import (Ada, Buffer);
begin
- Ada.Assertions.Assert (Short_Integer'Size = Interfaces.C.short'Size);
return Count_Type (asf_readf_short (File.Ptr, Buffer, Interfaces.Integer_64 (Frames)));
end Read_Short;
@@ -907,7 +905,6 @@ package body Libsndfile is
for Buffer'Address use Data'Address;
pragma Import (Ada, Buffer);
begin
- Ada.Assertions.Assert (Integer'Size = Interfaces.C.int'Size);
return Count_Type (asf_readf_int (File.Ptr, Buffer, Interfaces.Integer_64 (Frames)));
end Read_Integer;
@@ -921,7 +918,6 @@ package body Libsndfile is
for Buffer'Address use Data'Address;
pragma Import (Ada, Buffer);
begin
- Ada.Assertions.Assert (Float'Size = Interfaces.C.C_float'Size);
return Count_Type (asf_readf_float (File.Ptr, Buffer, Interfaces.Integer_64 (Frames)));
end Read_Float;
@@ -935,7 +931,6 @@ package body Libsndfile is
for Buffer'Address use Data'Address;
pragma Import (Ada, Buffer);
begin
- Ada.Assertions.Assert (Long_Float'Size = Interfaces.C.double'Size);
return Count_Type (asf_readf_double (File.Ptr, Buffer, Interfaces.Integer_64 (Frames)));
end Read_Double;
@@ -949,7 +944,6 @@ package body Libsndfile is
for Buffer'Address use Data'Address;
pragma Import (Ada, Buffer);
begin
- Ada.Assertions.Assert (Short_Integer'Size = Interfaces.C.short'Size);
return Count_Type (asf_writef_short (File.Ptr, Buffer, Interfaces.Integer_64 (Frames)));
end Write_Short;
@@ -963,7 +957,6 @@ package body Libsndfile is
for Buffer'Address use Data'Address;
pragma Import (Ada, Buffer);
begin
- Ada.Assertions.Assert (Integer'Size = Interfaces.C.int'Size);
return Count_Type (asf_writef_int (File.Ptr, Buffer, Interfaces.Integer_64 (Frames)));
end Write_Integer;
@@ -977,7 +970,6 @@ package body Libsndfile is
for Buffer'Address use Data'Address;
pragma Import (Ada, Buffer);
begin
- Ada.Assertions.Assert (Float'Size = Interfaces.C.C_float'Size);
return Count_Type (asf_writef_float (File.Ptr, Buffer, Interfaces.Integer_64 (Frames)));
end Write_Float;
@@ -991,7 +983,6 @@ package body Libsndfile is
for Buffer'Address use Data'Address;
pragma Import (Ada, Buffer);
begin
- Ada.Assertions.Assert (Long_Float'Size = Interfaces.C.double'Size);
return Count_Type (asf_writef_double (File.Ptr, Buffer, Interfaces.Integer_64 (Frames)));
end Write_Double;
@@ -1001,7 +992,6 @@ package body Libsndfile is
Bytes : in Count_Type)
return Count_Type is
begin
- Ada.Assertions.Assert (Character'Size = 8);
return Count_Type (asf_read_raw
(File.Ptr,
Storage.To_Integer (Data'Address),
@@ -1014,7 +1004,6 @@ package body Libsndfile is
Bytes : in Count_Type)
return Count_Type is
begin
- Ada.Assertions.Assert (Character'Size = 8);
return Count_Type (asf_write_raw
(File.Ptr,
Storage.To_Integer (Data'Address),
@@ -1084,7 +1073,7 @@ package body Libsndfile is
(File : in Sound_File)
return Natural
is
- Result : Interfaces.C.int := sf_current_byterate (File.Ptr);
+ Result : constant Interfaces.C.int := sf_current_byterate (File.Ptr);
begin
if Result >= 0 then
return Natural (Result);
diff --git a/src/libsndfile.ads b/src/libsndfile.ads
index 65ffeac..f996f9d 100644
--- a/src/libsndfile.ads
+++ b/src/libsndfile.ads
@@ -363,6 +363,13 @@ private
(c_pointer_size * Interfaces.C.CHAR_BIT = Storage.Integer_Address'Size,
"Size of C void pointers and size of Ada address values do not match");
+ -- More things that shouldn't fail unless something really weird happens
+ pragma Assert (Short_Integer'Size = Interfaces.C.short'Size);
+ pragma Assert (Integer'Size = Interfaces.C.int'Size);
+ pragma Assert (Float'Size = Interfaces.C.C_float'Size);
+ pragma Assert (Long_Float'Size = Interfaces.C.double'Size);
+ pragma Assert (Character'Size = Interfaces.C.CHAR_BIT);
+
pragma Inline (Is_Open);
pragma Inline (Write_Sync);
generated by cgit (git 2.30.0) at 2025-07-04 06:02:07 +0000