From 1ec1deedee97c03aec0a0e306e9dcda19afdfd81 Mon Sep 17 00:00:00 2001 From: Nikita Smith Date: Sat, 22 Mar 2025 20:37:39 -0700 Subject: [PATCH] moved MSF magic checkers to msf.c --- src/msf/msf.c | 12 ++++++++++++ src/msf/msf.h | 5 +++++ src/msf/msf_parse.c | 6 ++---- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/msf/msf.c b/src/msf/msf.c index f78cec82..116918c8 100644 --- a/src/msf/msf.c +++ b/src/msf/msf.c @@ -1,4 +1,16 @@ // Copyright (c) 2024 Epic Games Tools // Licensed under the MIT license (https://opensource.org/license/mit/) +internal B32 +msf_check_magic_20(String8 data) +{ + B32 is_msf = data.size >= sizeof(msf_msf20_magic) && str8_match(data, str8_lit(msf_msf20_magic), StringMatchFlag_RightSideSloppy); + return is_msf; +} +internal B32 +msf_check_magic_70(String8 data) +{ + B32 is_msf = data.size >= sizeof(msf_msf70_magic) && str8_match(data, str8_lit(msf_msf70_magic), StringMatchFlag_RightSideSloppy); + return is_msf; +} diff --git a/src/msf/msf.h b/src/msf/msf.h index f18d8204..34bc9960 100644 --- a/src/msf/msf.h +++ b/src/msf/msf.h @@ -52,4 +52,9 @@ struct MSF_Header70 MSF_PageNumber root_pn; }; +//////////////////////////////// + +internal B32 msf_check_magic_20(String8 data); +internal B32 msf_check_magic_70(String8 data); + #endif // MSF_H diff --git a/src/msf/msf_parse.c b/src/msf/msf_parse.c index 79d00fd1..941f5d40 100644 --- a/src/msf/msf_parse.c +++ b/src/msf/msf_parse.c @@ -13,11 +13,9 @@ msf_raw_stream_table_from_data(Arena *arena, String8 msf_data) //- determine msf type U32 index_size = 0; - if (msf_data.size >= sizeof(msf_msf20_magic) && - str8_match(msf_data, str8_lit(msf_msf20_magic), StringMatchFlag_RightSideSloppy)) { + if (msf_check_magic_20(msf_data)) { index_size = 2; - } else if (msf_data.size >= sizeof(msf_msf70_magic) && - str8_match(msf_data, str8_lit(msf_msf70_magic), StringMatchFlag_RightSideSloppy)) { + } else if (msf_check_magic_70(msf_data)) { index_size = 4; }