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

Merge pull request #8073 from keszybz/two-fixes

Browse source 
Two fixes
This commit is contained in:
Yu Watanabe 2018-02-03 20:11:17 +09:00 committed by GitHub
parent 75f4077960 06815764d1
commit cf6e1e6333
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
man/systemd-analyze.xml
View file

@ -322,9 +322,8 @@
<listitem><para>Invoke unit generators, see
<citerefentry><refentrytitle>systemd.generator</refentrytitle><manvolnum>7</manvolnum></citerefentry>.
Some generators require root privileges. When run under a
normal users, enabling generators will generally result in
some warnings.</para></listitem>
Some generators require root privileges. Under a normal user, running with
generators enabled will generally result in some warnings.</para></listitem>
</varlistentry>
<xi:include href="user-system-options.xml" xpointer="host" />

10
src/basic/hashmap.c
View file

@ -1900,8 +1900,6 @@ int set_put_strsplit(Set *s, const char *v, const char *separators, ExtractFlags
/* expand the cachemem if needed, return true if newly (re)activated. */
static int cachemem_maintain(CacheMem *mem, unsigned size) {
int r = false;
assert(mem);
if (!GREEDY_REALLOC(mem->ptr, mem->n_allocated, size)) {
@ -1909,10 +1907,12 @@ static int cachemem_maintain(CacheMem *mem, unsigned size) {
return -ENOMEM;
}
if (!mem->active)
mem->active = r = true;
if (!mem->active) {
mem->active = true;
return true;
}
return r;
return false;
}
int iterated_cache_get(IteratedCache *cache, const void ***res_keys, const void ***res_values, unsigned *res_n_entries) {