From cba14b91e4a1ccb95e1d25828cfc6821163053a1 Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Sat, 17 Dec 2022 13:16:28 +0000
Subject: [PATCH] Pass std::span to piggy_find_sound

---
 common/main/fwd-piggy.h | 2 +-
 similar/main/bmread.cpp | 6 ++----
 similar/main/piggy.cpp  | 8 ++------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/common/main/fwd-piggy.h b/common/main/fwd-piggy.h
index 89d5fb311..aa564c4d0 100644
--- a/common/main/fwd-piggy.h
+++ b/common/main/fwd-piggy.h
@@ -126,7 +126,7 @@ grs_bitmap *read_extra_bitmap_d1_pig(std::span<const char> name, grs_bitmap &out
 void read_sndfile(int required);
 #endif
 }
-int piggy_find_sound(const char *name);
+int piggy_find_sound(std::span<const char> name);
 
 void piggy_read_bitmap_data(grs_bitmap * bmp);
 
diff --git a/similar/main/bmread.cpp b/similar/main/bmread.cpp
index 76871b456..026f23202 100644
--- a/similar/main/bmread.cpp
+++ b/similar/main/bmread.cpp
@@ -380,7 +380,6 @@ static void ab_load(int skip, const char * filename, std::array<bitmap_index, MA
 }
 
 int ds_load(int skip, const char * filename )	{
-	int i;
 	char rawname[100];
 
 	if (skip) {
@@ -397,7 +396,7 @@ int ds_load(int skip, const char * filename )	{
 	snprintf(rawname, sizeof(rawname), "Sounds/%s.%s", fname.data(), (GameArg.SndDigiSampleRate==SAMPLE_RATE_22K) ? "r22" : "raw");
 #endif
 
-	i = piggy_find_sound(fname.data());
+	const auto i = piggy_find_sound(fname);
 	if (i!=255)	{
 		return i;
 	}
@@ -408,11 +407,10 @@ int ds_load(int skip, const char * filename )	{
 		n.data = digi_sound::allocated_data{std::make_unique<uint8_t[]>(n.length), game_sound_offset{}};
 		PHYSFS_read(cfp, n.data.get(), 1, n.length);
 		n.freq = 11025;
-		i = piggy_register_sound(n, fname);
+		return piggy_register_sound(n, fname);
 	} else {
 		return 255;
 	}
-	return i;
 }
 }
 
diff --git a/similar/main/piggy.cpp b/similar/main/piggy.cpp
index ec70bac97..55a188f06 100644
--- a/similar/main/piggy.cpp
+++ b/similar/main/piggy.cpp
@@ -424,15 +424,11 @@ bitmap_index piggy_find_bitmap(const std::span<const char> entry_name)
 
 }
 
-int piggy_find_sound(const char *name)
+int piggy_find_sound(const std::span<const char> name)
 {
-	int i;
-
-	i = hashtable_search( &AllDigiSndNames, name );
-
+	const auto i = hashtable_search(&AllDigiSndNames, name.data());
 	if ( i < 0 )
 		return 255;
-
 	return i;
 }