Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix type error on i686 #579

Closed
wants to merge 2 commits into from
Closed

Conversation

xambroz
Copy link
Contributor

@xambroz xambroz commented May 16, 2024

This fixes the type error on i686 when compiling with gcc 14. Mentioned in bug report #578

xambroz added 2 commits May 16, 2024 03:31
This fixes the type error on i686 when compiling with gcc 14.
Mentioned in bug report martijnvanbrummelen#578
It is probably better to use the uint64_t type which is really used in the code for the respective generators
@Knogle
Copy link
Contributor

Knogle commented May 16, 2024

Ahoy. Please run make format, and commit again :)

@PartialVolume
Copy link
Collaborator

@xambroz Hi, I would like to merge this however it needs the following change made

diff --git a/src/prng.c b/src/prng.c
index facef65..abf1b6c 100644
--- a/src/prng.c
+++ b/src/prng.c
@@ -284,8 +284,7 @@ int nwipe_xoroshiro256_prng_init( NWIPE_PRNG_INIT_SIGNATURE )
         /* This is the first time that we have been called. */
         *state = malloc( sizeof( xoroshiro256_state_t ) );
     }
-    xoroshiro256_init(
-        (xoroshiro256_state_t*) *state, (uint64_t*) ( seed->s ), seed->length / sizeof( uint64_t ) );
+    xoroshiro256_init( (xoroshiro256_state_t*) *state, (uint64_t*) ( seed->s ), seed->length / sizeof( uint64_t ) );
 
     return 0;
 }
make: *** [Makefile:797: check-format] Error 1

As @Knogle mentioned, you just need to run make format and commit the change so ci_formatting will pass.

I did try to do a PR on patch-5 but can't seem to do that without deleting my own fork of nwipe

@Knogle
Copy link
Contributor

Knogle commented Aug 19, 2024

@PartialVolume did you try to do it in a new branch?
Otherwise i could submit the fixed PR for this.

@PartialVolume
Copy link
Collaborator

Merged #588

@PartialVolume
Copy link
Collaborator

Closing as this fix was included in #588

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants