Skip to content

Commit cd238a4

Browse files
committed
Fix GCC warnings
1 parent 9b7a5eb commit cd238a4

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/deemon/execute/dec.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -417,10 +417,8 @@ DeeDec_Relocate(/*inherit(on_success)*/ DeeDec_Ehdr *__restrict self,
417417
if (dep_buildid->mbi_word64[0] != dependency->d_buildid[0] ||
418418
dep_buildid->mbi_word64[1] != dependency->d_buildid[1]) {
419419
Dee_uint128_t expected_buildid, actual_buildid;
420-
__hybrid_uint128_setword64(expected_buildid, 0, dependency->d_buildid[0]);
421-
__hybrid_uint128_setword64(expected_buildid, 1, dependency->d_buildid[1]);
422-
__hybrid_uint128_setword64(actual_buildid, 0, dep_buildid->mbi_word64[0]);
423-
__hybrid_uint128_setword64(actual_buildid, 1, dep_buildid->mbi_word64[1]);
420+
memcpy(&expected_buildid, dependency->d_buildid, sizeof(expected_buildid));
421+
memcpy(&actual_buildid, dep_buildid, sizeof(actual_buildid));
424422
Dee_DPRINTF("[LD][dec %q] CORRUPT: Dependency %q has unexpected build ID. "
425423
/**/ "Expected: %#.32" PRFx128 ", Actual: %#.32" PRFx128 "\n",
426424
context_absname, DeeModule_GetAbsName(dep),

src/deemon/execute/module.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,9 @@ DeeModule_GetRootFunction(DeeModuleObject *__restrict self) {
279279
PRIVATE ATTR_NOINLINE WUNUSED NONNULL((1)) void DCALL
280280
DeeModule_GetBuildId_uncached(DeeModuleObject *__restrict self) {
281281
if (self == &DeeModule_Deemon) {
282-
DeeExec_GetBuildId();
282+
union Dee_module_buildid const *temp;
283+
temp = DeeExec_GetBuildId();
284+
(void)temp;
283285
return;
284286
}
285287

0 commit comments

Comments
 (0)