From f2a062b4c06f5414386d208a2dae81ab162fab8e Mon Sep 17 00:00:00 2001 From: Ryan Fleury Date: Sun, 28 Nov 2021 12:25:54 -0700 Subject: [PATCH] split -> splitter in split API --- source/md.c | 17 +++++++++-------- source/md.h | 4 ++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/source/md.c b/source/md.c index d0fb440..9f289bc 100644 --- a/source/md.c +++ b/source/md.c @@ -222,7 +222,7 @@ static void MD_WIN32_FileIterEnd(MD_FileIter *it) { MD_WIN32_FileIter *win32_it = (MD_WIN32_FileIter*)it; - CloseHandle(win32_it->state); + FindClose(win32_it->state); } #endif @@ -1081,7 +1081,8 @@ MD_S8ListConcat(MD_String8List *list, MD_String8List *to_push) } MD_FUNCTION MD_String8List -MD_S8Split(MD_Arena *arena, MD_String8 string, int split_count, MD_String8 *splits) +MD_S8Split(MD_Arena *arena, MD_String8 string, int splitter_count, + MD_String8 *splitters) { MD_String8List list = MD_ZERO_STRUCT; @@ -1089,15 +1090,15 @@ MD_S8Split(MD_Arena *arena, MD_String8 string, int split_count, MD_String8 *spli for(MD_u64 i = 0; i < string.size; i += 1) { MD_b32 was_split = 0; - for(int split_idx = 0; split_idx < split_count; split_idx += 1) + for(int split_idx = 0; split_idx < splitter_count; split_idx += 1) { MD_b32 match = 0; - if(i + splits[split_idx].size <= string.size) + if(i + splitters[split_idx].size <= string.size) { match = 1; - for(MD_u64 split_i = 0; split_i < splits[split_idx].size && i + split_i < string.size; split_i += 1) + for(MD_u64 split_i = 0; split_i < splitters[split_idx].size && i + split_i < string.size; split_i += 1) { - if(splits[split_idx].str[split_i] != string.str[i + split_i]) + if(splitters[split_idx].str[split_i] != string.str[i + split_i]) { match = 0; break; @@ -1108,8 +1109,8 @@ MD_S8Split(MD_Arena *arena, MD_String8 string, int split_count, MD_String8 *spli { MD_String8 split_string = MD_S8(string.str + split_start, i - split_start); MD_S8ListPush(arena, &list, split_string); - split_start = i + splits[split_idx].size; - i += splits[split_idx].size - 1; + split_start = i + splitters[split_idx].size; + i += splitters[split_idx].size - 1; was_split = 1; break; } diff --git a/source/md.h b/source/md.h index aa9b2cc..33b0d95 100644 --- a/source/md.h +++ b/source/md.h @@ -1009,8 +1009,8 @@ MD_FUNCTION void MD_S8ListPushFmt(MD_Arena *arena, MD_String8List *lis char *fmt, ...); MD_FUNCTION void MD_S8ListConcat(MD_String8List *list, MD_String8List *to_push); -MD_FUNCTION MD_String8List MD_S8Split(MD_Arena *arena, MD_String8 string, int split_count, - MD_String8 *splits); +MD_FUNCTION MD_String8List MD_S8Split(MD_Arena *arena, MD_String8 string, int splitter_count, + MD_String8 *splitters); MD_FUNCTION MD_String8 MD_S8ListJoin(MD_Arena *arena, MD_String8List list, MD_StringJoin *join); MD_FUNCTION MD_String8 MD_S8ListJoinMid(MD_Arena *arena, MD_String8List list,