resource id compar typo

This commit is contained in:
Nikita Smith
2025-02-25 14:41:34 -08:00
parent 1d441bac30
commit 8a8a8bcc8d
2 changed files with 62 additions and 62 deletions
+19 -19
View File
@@ -8,9 +8,9 @@ coff_is_big_obj(String8 raw_coff)
if (raw_coff.size >= sizeof(COFF_BigObjHeader)) { if (raw_coff.size >= sizeof(COFF_BigObjHeader)) {
COFF_BigObjHeader *file_header32 = (COFF_BigObjHeader*)(raw_coff.str); COFF_BigObjHeader *file_header32 = (COFF_BigObjHeader*)(raw_coff.str);
is_big_obj = file_header32->sig1 == COFF_Machine_Unknown && is_big_obj = file_header32->sig1 == COFF_Machine_Unknown &&
file_header32->sig2 == max_U16 && file_header32->sig2 == max_U16 &&
file_header32->version >= 2 && file_header32->version >= 2 &&
MemoryCompare(file_header32->magic, g_coff_big_header_magic, sizeof(file_header32->magic)) == 0; MemoryCompare(file_header32->magic, g_coff_big_header_magic, sizeof(file_header32->magic)) == 0;
} }
return is_big_obj; return is_big_obj;
} }
@@ -411,14 +411,14 @@ coff_write_resource_id(Arena *arena, COFF_ResourceID id)
{ {
String8 result = str8_zero(); String8 result = str8_zero();
switch (id.type) { switch (id.type) {
case COFF_ResourceIDType_Null: break; case COFF_ResourceIDType_Null: break;
case COFF_ResourceIDType_Number: { case COFF_ResourceIDType_Number: {
result = coff_resource_number_from_u16(arena, id.u.number); result = coff_resource_number_from_u16(arena, id.u.number);
} break; } break;
case COFF_ResourceIDType_String: { case COFF_ResourceIDType_String: {
result = coff_resource_string_from_str8(arena, id.u.string); result = coff_resource_string_from_str8(arena, id.u.string);
} break; } break;
default: InvalidPath; default: InvalidPath;
} }
return result; return result;
} }
@@ -476,15 +476,15 @@ coff_write_resource(Arena *arena,
internal int internal int
coff_resource_id_compar(void *raw_a, void *raw_b) coff_resource_id_compar(void *raw_a, void *raw_b)
{ {
int cmp = 0; int cmp;
COFF_ResourceID *a = raw_a; COFF_ResourceID *a = raw_a;
COFF_ResourceID *b = raw_b; COFF_ResourceID *b = raw_b;
if (a->type == b->type) { if (a->type == b->type) {
switch (a->type) { switch (a->type) {
case COFF_ResourceIDType_Null: cmp = 0; break; default:
case COFF_ResourceIDType_Number: cmp = MemoryCompare(&a->u.number, &b->u.number, sizeof(a->u.number)); break; case COFF_ResourceIDType_Null: cmp = 0; break;
case COFF_ResourceIDType_String: cmp = strncmp((char *)a->u.string.str, (char *)b->u.string.str, Min(a->u.string.size, b->u.string.size)); break; case COFF_ResourceIDType_Number: cmp = MemoryCompare(&a->u.number, &b->u.number, sizeof(a->u.number)); break;
default: InvalidPath; break; case COFF_ResourceIDType_String: cmp = strncmp((char *)a->u.string.str, (char *)b->u.string.str, Min(a->u.string.size, b->u.string.size)); break;
} }
} else { } else {
cmp = a->type < b->type ? -1 : a->type > b->type ? +1 : 0; cmp = a->type < b->type ? -1 : a->type > b->type ? +1 : 0;
@@ -894,9 +894,9 @@ coff_archive_parse_from_data(String8 raw_archive)
{ {
COFF_ArchiveType type = coff_archive_type_from_data(raw_archive); COFF_ArchiveType type = coff_archive_type_from_data(raw_archive);
switch (type) { switch (type) {
case COFF_Archive_Null: break; case COFF_Archive_Null: break;
case COFF_Archive_Regular: return coff_regular_archive_parse_from_data(raw_archive); case COFF_Archive_Regular: return coff_regular_archive_parse_from_data(raw_archive);
case COFF_Archive_Thin: return coff_thin_archive_parse_from_data(raw_archive); case COFF_Archive_Thin: return coff_thin_archive_parse_from_data(raw_archive);
} }
COFF_ArchiveParse null_parse = {0}; COFF_ArchiveParse null_parse = {0};
return null_parse; return null_parse;
+1 -1
View File
@@ -1568,7 +1568,7 @@ pe_resource_dir_push_dir(Arena *arena, PE_ResourceDir *dir, COFF_ResourceID id,
internal PE_ResourceNode * internal PE_ResourceNode *
pe_resource_dir_search_node(PE_ResourceDir *dir, COFF_ResourceID id) pe_resource_dir_search_node(PE_ResourceDir *dir, COFF_ResourceID id)
{ {
for (PE_ResourceNode *i = dir->id_list.first; i != NULL; i = i->next) { for (PE_ResourceNode *i = dir->id_list.first; i != 0; i = i->next) {
if (coff_resource_id_compar(&i->data.id, &id) == 0) { if (coff_resource_id_compar(&i->data.id, &id) == 0) {
return i; return i;
} }