picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

journal: fix build in VALGRIND compatibility mode

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2012-10-12 12:56:19 +00:00
parent 1ca6783f5e
commit 1b4bb4fdac
2 changed files with 57 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README
View File

@ -105,6 +105,11 @@ WARNINGS:
For more information on this issue consult
http://freedesktop.org/wiki/Software/systemd/separate-usr-is-broken
To run systemd under valgrind, compile with VALGRIND defined
(e.g. ./configure CPPFLAGS='... -DVALGRIND=1'). Otherwise,
false positives will be triggered by code which violates
some rules but is actually safe.
ENGINEERING AND CONSULTING SERVICES:
ProFUSION <http://profusion.mobi> offers professional
engineering and consulting services for systemd for embedded

12
src/journal/lookup3.c
View File

@ -337,8 +337,9 @@ uint32_t jenkins_hashlittle( const void *key, size_t length, uint32_t initval)
}
#else /* make valgrind happy */
{
const uint8_t *k8 = (const uint8_t *) k;
k8 = (const uint8_t *)k;
switch(length)
{
case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
@ -355,6 +356,7 @@ uint32_t jenkins_hashlittle( const void *key, size_t length, uint32_t initval)
case 1 : a+=k8[0]; break;
case 0 : return c;
}
}
#endif /* !valgrind */
@ -522,7 +524,8 @@ void jenkins_hashlittle2(
#else /* make valgrind happy */
k8 = (const uint8_t *)k;
{
const uint8_t *k8 = (const uint8_t *)k;
switch(length)
{
case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
@ -539,6 +542,7 @@ void jenkins_hashlittle2(
case 1 : a+=k8[0]; break;
case 0 : *pc=c; *pb=b; return; /* zero length strings require no mixing */
}
}
#endif /* !valgrind */
@ -698,7 +702,8 @@ uint32_t jenkins_hashbig( const void *key, size_t length, uint32_t initval)
#else /* make valgrind happy */
k8 = (const uint8_t *)k;
{
const uint8_t *k8 = (const uint8_t *)k;
switch(length) /* all the case statements fall through */
{
case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
@ -715,6 +720,7 @@ uint32_t jenkins_hashbig( const void *key, size_t length, uint32_t initval)
case 1 : a+=((uint32_t)k8[0])<<24; break;
case 0 : return c;
}
}
#endif /* !VALGRIND */