[systemd-commits] 4 commits - catalog/systemd.fr.catalog man/systemd.resource-control.xml po/fr.po src/journal src/libsystemd src/resolve src/test
Ronny Chevalier
rchevalier at kemper.freedesktop.org
Thu Jan 22 14:12:44 PST 2015
catalog/systemd.fr.catalog | 8 -
man/systemd.resource-control.xml | 12 -
po/fr.po | 191 ++++++++++++++++--------------
src/journal/test-compress-benchmark.c | 18 +-
src/journal/test-compress.c | 4
src/journal/test-journal-flush.c | 7 -
src/journal/test-journal-interleaving.c | 34 ++---
src/journal/test-journal-stream.c | 3
src/libsystemd/sd-bus/test-bus-chat.c | 7 -
src/libsystemd/sd-bus/test-bus-gvariant.c | 179 ++++++++++++++--------------
src/libsystemd/sd-bus/test-bus-match.c | 4
src/libsystemd/sd-event/test-event.c | 19 +-
src/libsystemd/sd-resolve/test-resolve.c | 11 -
src/resolve/test-dns-domain.c | 3
src/test/test-sigbus.c | 2
src/test/test-util.c | 4
16 files changed, 260 insertions(+), 246 deletions(-)
New commits:
commit 0c0cdb06c139b52ff103287f6909b3daa5b2dc54
Author: Ronny Chevalier <chevalier.ronny at gmail.com>
Date: Thu Jan 22 22:53:42 2015 +0100
tests: use assert_se instead of assert
Otherwise they can be optimized away with -DNDEBUG
diff --git a/src/journal/test-compress-benchmark.c b/src/journal/test-compress-benchmark.c
index b3bc3ec..c8e5b76 100644
--- a/src/journal/test-compress-benchmark.c
+++ b/src/journal/test-compress-benchmark.c
@@ -32,7 +32,7 @@ static char* make_buf(size_t count) {
size_t i;
buf = malloc(count);
- assert(buf);
+ assert_se(buf);
for (i = 0; i < count; i++)
buf[i] = 'a' + i % ('z' - 'a' + 1);
@@ -52,7 +52,7 @@ static void test_compress_decompress(const char* label,
text = make_buf(MAX_SIZE);
buf = calloc(MAX_SIZE + 1, 1);
- assert(text && buf);
+ assert_se(text && buf);
n = now(CLOCK_MONOTONIC);
@@ -62,24 +62,24 @@ static void test_compress_decompress(const char* label,
r = compress(text, i, buf, &j);
/* assume compression must be successful except for small inputs */
- assert(r == 0 || (i < 2048 && r == -ENOBUFS));
+ assert_se(r == 0 || (i < 2048 && r == -ENOBUFS));
/* check for overwrites */
- assert(buf[i] == 0);
+ assert_se(buf[i] == 0);
if (r != 0) {
skipped += i;
continue;
}
- assert(j > 0);
+ assert_se(j > 0);
if (j >= i)
log_error("%s \"compressed\" %zu -> %zu", label, i, j);
r = decompress(buf, j, &buf2, &buf2_allocated, &k, 0);
- assert(r == 0);
- assert(buf2_allocated >= k);
- assert(k == i);
+ assert_se(r == 0);
+ assert_se(buf2_allocated >= k);
+ assert_se(k == i);
- assert(memcmp(text, buf2, i) == 0);
+ assert_se(memcmp(text, buf2, i) == 0);
total += i;
compressed += j;
diff --git a/src/journal/test-compress.c b/src/journal/test-compress.c
index 97577e8..ae41c0c 100644
--- a/src/journal/test-compress.c
+++ b/src/journal/test-compress.c
@@ -175,7 +175,7 @@ static void test_compress_stream(int compression,
assert_se(lseek(dst, 0, SEEK_SET) == 0);
r = decompress(dst, dst2, st.st_size);
- assert(r == 0);
+ assert_se(r == 0);
assert_se(asprintf(&cmd2, "diff %s %s", srcfile, pattern2) > 0);
assert_se(system(cmd2) == 0);
@@ -189,7 +189,7 @@ static void test_compress_stream(int compression,
assert_se(lseek(dst, 0, SEEK_SET) == 0);
assert_se(lseek(dst2, 0, SEEK_SET) == 0);
r = decompress(dst, dst2, st.st_size - 1);
- assert(r == -EFBIG);
+ assert_se(r == -EFBIG);
assert_se(unlink(pattern) == 0);
assert_se(unlink(pattern2) == 0);
diff --git a/src/journal/test-journal-flush.c b/src/journal/test-journal-flush.c
index 40ede4a..914ca0b 100644
--- a/src/journal/test-journal-flush.c
+++ b/src/journal/test-journal-flush.c
@@ -22,6 +22,7 @@
#include <fcntl.h>
#include "sd-journal.h"
+#include "macro.h"
#include "journal-file.h"
#include "journal-internal.h"
@@ -49,13 +50,13 @@ int main(int argc, char *argv[]) {
JournalFile *f;
f = j->current_file;
- assert(f && f->current_offset > 0);
+ assert_se(f && f->current_offset > 0);
r = journal_file_move_to_object(f, OBJECT_ENTRY, f->current_offset, &o);
- assert(r >= 0);
+ assert_se(r >= 0);
r = journal_file_copy_entry(f, new_journal, o, f->current_offset, NULL, NULL, NULL);
- assert(r >= 0);
+ assert_se(r >= 0);
n++;
if (n > 10000)
diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c
index 23a26c4..3c70601 100644
--- a/src/journal/test-journal-interleaving.c
+++ b/src/journal/test-journal-interleaving.c
@@ -212,43 +212,43 @@ static void test_sequence_numbers(void) {
append_number(one, 1, &seqnum);
printf("seqnum=%"PRIu64"\n", seqnum);
- assert(seqnum == 1);
+ assert_se(seqnum == 1);
append_number(one, 2, &seqnum);
printf("seqnum=%"PRIu64"\n", seqnum);
- assert(seqnum == 2);
+ assert_se(seqnum == 2);
- assert(one->header->state == STATE_ONLINE);
- assert(!sd_id128_equal(one->header->file_id, one->header->machine_id));
- assert(!sd_id128_equal(one->header->file_id, one->header->boot_id));
- assert(sd_id128_equal(one->header->file_id, one->header->seqnum_id));
+ assert_se(one->header->state == STATE_ONLINE);
+ assert_se(!sd_id128_equal(one->header->file_id, one->header->machine_id));
+ assert_se(!sd_id128_equal(one->header->file_id, one->header->boot_id));
+ assert_se(sd_id128_equal(one->header->file_id, one->header->seqnum_id));
memcpy(&seqnum_id, &one->header->seqnum_id, sizeof(sd_id128_t));
assert_se(journal_file_open("two.journal", O_RDWR|O_CREAT, 0644,
true, false, NULL, NULL, one, &two) == 0);
- assert(two->header->state == STATE_ONLINE);
- assert(!sd_id128_equal(two->header->file_id, one->header->file_id));
- assert(sd_id128_equal(one->header->machine_id, one->header->machine_id));
- assert(sd_id128_equal(one->header->boot_id, one->header->boot_id));
- assert(sd_id128_equal(one->header->seqnum_id, one->header->seqnum_id));
+ assert_se(two->header->state == STATE_ONLINE);
+ assert_se(!sd_id128_equal(two->header->file_id, one->header->file_id));
+ assert_se(sd_id128_equal(one->header->machine_id, one->header->machine_id));
+ assert_se(sd_id128_equal(one->header->boot_id, one->header->boot_id));
+ assert_se(sd_id128_equal(one->header->seqnum_id, one->header->seqnum_id));
append_number(two, 3, &seqnum);
printf("seqnum=%"PRIu64"\n", seqnum);
- assert(seqnum == 3);
+ assert_se(seqnum == 3);
append_number(two, 4, &seqnum);
printf("seqnum=%"PRIu64"\n", seqnum);
- assert(seqnum == 4);
+ assert_se(seqnum == 4);
test_close(two);
append_number(one, 5, &seqnum);
printf("seqnum=%"PRIu64"\n", seqnum);
- assert(seqnum == 5);
+ assert_se(seqnum == 5);
append_number(one, 6, &seqnum);
printf("seqnum=%"PRIu64"\n", seqnum);
- assert(seqnum == 6);
+ assert_se(seqnum == 6);
test_close(one);
@@ -258,11 +258,11 @@ static void test_sequence_numbers(void) {
assert_se(journal_file_open("two.journal", O_RDWR, 0,
true, false, NULL, NULL, NULL, &two) == 0);
- assert(sd_id128_equal(two->header->seqnum_id, seqnum_id));
+ assert_se(sd_id128_equal(two->header->seqnum_id, seqnum_id));
append_number(two, 7, &seqnum);
printf("seqnum=%"PRIu64"\n", seqnum);
- assert(seqnum == 5);
+ assert_se(seqnum == 5);
/* So..., here we have the same seqnum in two files with the
* same seqnum_id. */
diff --git a/src/journal/test-journal-stream.c b/src/journal/test-journal-stream.c
index 8ccd813..3996e77 100644
--- a/src/journal/test-journal-stream.c
+++ b/src/journal/test-journal-stream.c
@@ -28,13 +28,14 @@
#include "journal-internal.h"
#include "util.h"
#include "log.h"
+#include "macro.h"
#define N_ENTRIES 200
static void verify_contents(sd_journal *j, unsigned skip) {
unsigned i;
- assert(j);
+ assert_se(j);
i = 0;
SD_JOURNAL_FOREACH(j) {
diff --git a/src/libsystemd/sd-bus/test-bus-chat.c b/src/libsystemd/sd-bus/test-bus-chat.c
index 06edd62..8625ee6 100644
--- a/src/libsystemd/sd-bus/test-bus-chat.c
+++ b/src/libsystemd/sd-bus/test-bus-chat.c
@@ -19,7 +19,6 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <assert.h>
#include <stdlib.h>
#include <pthread.h>
#include <unistd.h>
@@ -44,7 +43,7 @@ static int match_callback(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus
static int object_callback(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
int r;
- assert(bus);
+ assert_se(bus);
if (sd_bus_message_is_method_error(m, NULL))
return 0;
@@ -68,7 +67,7 @@ static int server_init(sd_bus **_bus) {
int r;
const char *unique;
- assert(_bus);
+ assert_se(_bus);
r = sd_bus_open_user(&bus);
if (r < 0) {
@@ -299,7 +298,7 @@ static void* client1(void*p) {
goto finish;
}
- assert(streq(hello, "hello"));
+ assert_se(streq(hello, "hello"));
if (pipe2(pp, O_CLOEXEC|O_NONBLOCK) < 0) {
log_error_errno(errno, "Failed to allocate pipe: %m");
diff --git a/src/libsystemd/sd-bus/test-bus-gvariant.c b/src/libsystemd/sd-bus/test-bus-gvariant.c
index d700a35..6992ec4 100644
--- a/src/libsystemd/sd-bus/test-bus-gvariant.c
+++ b/src/libsystemd/sd-bus/test-bus-gvariant.c
@@ -24,6 +24,7 @@
#endif
#include "util.h"
+#include "macro.h"
#include "sd-bus.h"
#include "bus-gvariant.h"
#include "bus-util.h"
@@ -32,101 +33,101 @@
#include "bus-dump.h"
static void test_bus_gvariant_is_fixed_size(void) {
- assert(bus_gvariant_is_fixed_size("") > 0);
- assert(bus_gvariant_is_fixed_size("()") > 0);
- assert(bus_gvariant_is_fixed_size("y") > 0);
- assert(bus_gvariant_is_fixed_size("u") > 0);
- assert(bus_gvariant_is_fixed_size("b") > 0);
- assert(bus_gvariant_is_fixed_size("n") > 0);
- assert(bus_gvariant_is_fixed_size("q") > 0);
- assert(bus_gvariant_is_fixed_size("i") > 0);
- assert(bus_gvariant_is_fixed_size("t") > 0);
- assert(bus_gvariant_is_fixed_size("d") > 0);
- assert(bus_gvariant_is_fixed_size("s") == 0);
- assert(bus_gvariant_is_fixed_size("o") == 0);
- assert(bus_gvariant_is_fixed_size("g") == 0);
- assert(bus_gvariant_is_fixed_size("h") > 0);
- assert(bus_gvariant_is_fixed_size("ay") == 0);
- assert(bus_gvariant_is_fixed_size("v") == 0);
- assert(bus_gvariant_is_fixed_size("(u)") > 0);
- assert(bus_gvariant_is_fixed_size("(uuuuy)") > 0);
- assert(bus_gvariant_is_fixed_size("(uusuuy)") == 0);
- assert(bus_gvariant_is_fixed_size("a{ss}") == 0);
- assert(bus_gvariant_is_fixed_size("((u)yyy(b(iiii)))") > 0);
- assert(bus_gvariant_is_fixed_size("((u)yyy(b(iiivi)))") == 0);
+ assert_se(bus_gvariant_is_fixed_size("") > 0);
+ assert_se(bus_gvariant_is_fixed_size("()") > 0);
+ assert_se(bus_gvariant_is_fixed_size("y") > 0);
+ assert_se(bus_gvariant_is_fixed_size("u") > 0);
+ assert_se(bus_gvariant_is_fixed_size("b") > 0);
+ assert_se(bus_gvariant_is_fixed_size("n") > 0);
+ assert_se(bus_gvariant_is_fixed_size("q") > 0);
+ assert_se(bus_gvariant_is_fixed_size("i") > 0);
+ assert_se(bus_gvariant_is_fixed_size("t") > 0);
+ assert_se(bus_gvariant_is_fixed_size("d") > 0);
+ assert_se(bus_gvariant_is_fixed_size("s") == 0);
+ assert_se(bus_gvariant_is_fixed_size("o") == 0);
+ assert_se(bus_gvariant_is_fixed_size("g") == 0);
+ assert_se(bus_gvariant_is_fixed_size("h") > 0);
+ assert_se(bus_gvariant_is_fixed_size("ay") == 0);
+ assert_se(bus_gvariant_is_fixed_size("v") == 0);
+ assert_se(bus_gvariant_is_fixed_size("(u)") > 0);
+ assert_se(bus_gvariant_is_fixed_size("(uuuuy)") > 0);
+ assert_se(bus_gvariant_is_fixed_size("(uusuuy)") == 0);
+ assert_se(bus_gvariant_is_fixed_size("a{ss}") == 0);
+ assert_se(bus_gvariant_is_fixed_size("((u)yyy(b(iiii)))") > 0);
+ assert_se(bus_gvariant_is_fixed_size("((u)yyy(b(iiivi)))") == 0);
}
static void test_bus_gvariant_get_size(void) {
- assert(bus_gvariant_get_size("") == 0);
- assert(bus_gvariant_get_size("()") == 0);
- assert(bus_gvariant_get_size("y") == 1);
- assert(bus_gvariant_get_size("u") == 4);
- assert(bus_gvariant_get_size("b") == 1);
- assert(bus_gvariant_get_size("n") == 2);
- assert(bus_gvariant_get_size("q") == 2);
- assert(bus_gvariant_get_size("i") == 4);
- assert(bus_gvariant_get_size("t") == 8);
- assert(bus_gvariant_get_size("d") == 8);
- assert(bus_gvariant_get_size("s") < 0);
- assert(bus_gvariant_get_size("o") < 0);
- assert(bus_gvariant_get_size("g") < 0);
- assert(bus_gvariant_get_size("h") == 4);
- assert(bus_gvariant_get_size("ay") < 0);
- assert(bus_gvariant_get_size("v") < 0);
- assert(bus_gvariant_get_size("(u)") == 4);
- assert(bus_gvariant_get_size("(uuuuy)") == 20);
- assert(bus_gvariant_get_size("(uusuuy)") < 0);
- assert(bus_gvariant_get_size("a{ss}") < 0);
- assert(bus_gvariant_get_size("((u)yyy(b(iiii)))") == 28);
- assert(bus_gvariant_get_size("((u)yyy(b(iiivi)))") < 0);
- assert(bus_gvariant_get_size("((b)(t))") == 16);
- assert(bus_gvariant_get_size("((b)(b)(t))") == 16);
- assert(bus_gvariant_get_size("(bt)") == 16);
- assert(bus_gvariant_get_size("((t)(b))") == 16);
- assert(bus_gvariant_get_size("(tb)") == 16);
- assert(bus_gvariant_get_size("((b)(b))") == 2);
- assert(bus_gvariant_get_size("((t)(t))") == 16);
+ assert_se(bus_gvariant_get_size("") == 0);
+ assert_se(bus_gvariant_get_size("()") == 0);
+ assert_se(bus_gvariant_get_size("y") == 1);
+ assert_se(bus_gvariant_get_size("u") == 4);
+ assert_se(bus_gvariant_get_size("b") == 1);
+ assert_se(bus_gvariant_get_size("n") == 2);
+ assert_se(bus_gvariant_get_size("q") == 2);
+ assert_se(bus_gvariant_get_size("i") == 4);
+ assert_se(bus_gvariant_get_size("t") == 8);
+ assert_se(bus_gvariant_get_size("d") == 8);
+ assert_se(bus_gvariant_get_size("s") < 0);
+ assert_se(bus_gvariant_get_size("o") < 0);
+ assert_se(bus_gvariant_get_size("g") < 0);
+ assert_se(bus_gvariant_get_size("h") == 4);
+ assert_se(bus_gvariant_get_size("ay") < 0);
+ assert_se(bus_gvariant_get_size("v") < 0);
+ assert_se(bus_gvariant_get_size("(u)") == 4);
+ assert_se(bus_gvariant_get_size("(uuuuy)") == 20);
+ assert_se(bus_gvariant_get_size("(uusuuy)") < 0);
+ assert_se(bus_gvariant_get_size("a{ss}") < 0);
+ assert_se(bus_gvariant_get_size("((u)yyy(b(iiii)))") == 28);
+ assert_se(bus_gvariant_get_size("((u)yyy(b(iiivi)))") < 0);
+ assert_se(bus_gvariant_get_size("((b)(t))") == 16);
+ assert_se(bus_gvariant_get_size("((b)(b)(t))") == 16);
+ assert_se(bus_gvariant_get_size("(bt)") == 16);
+ assert_se(bus_gvariant_get_size("((t)(b))") == 16);
+ assert_se(bus_gvariant_get_size("(tb)") == 16);
+ assert_se(bus_gvariant_get_size("((b)(b))") == 2);
+ assert_se(bus_gvariant_get_size("((t)(t))") == 16);
}
static void test_bus_gvariant_get_alignment(void) {
- assert(bus_gvariant_get_alignment("") == 1);
- assert(bus_gvariant_get_alignment("()") == 1);
- assert(bus_gvariant_get_alignment("y") == 1);
- assert(bus_gvariant_get_alignment("b") == 1);
- assert(bus_gvariant_get_alignment("u") == 4);
- assert(bus_gvariant_get_alignment("s") == 1);
- assert(bus_gvariant_get_alignment("o") == 1);
- assert(bus_gvariant_get_alignment("g") == 1);
- assert(bus_gvariant_get_alignment("v") == 8);
- assert(bus_gvariant_get_alignment("h") == 4);
- assert(bus_gvariant_get_alignment("i") == 4);
- assert(bus_gvariant_get_alignment("t") == 8);
- assert(bus_gvariant_get_alignment("x") == 8);
- assert(bus_gvariant_get_alignment("q") == 2);
- assert(bus_gvariant_get_alignment("n") == 2);
- assert(bus_gvariant_get_alignment("d") == 8);
- assert(bus_gvariant_get_alignment("ay") == 1);
- assert(bus_gvariant_get_alignment("as") == 1);
- assert(bus_gvariant_get_alignment("au") == 4);
- assert(bus_gvariant_get_alignment("an") == 2);
- assert(bus_gvariant_get_alignment("ans") == 2);
- assert(bus_gvariant_get_alignment("ant") == 8);
- assert(bus_gvariant_get_alignment("(ss)") == 1);
- assert(bus_gvariant_get_alignment("(ssu)") == 4);
- assert(bus_gvariant_get_alignment("a(ssu)") == 4);
- assert(bus_gvariant_get_alignment("(u)") == 4);
- assert(bus_gvariant_get_alignment("(uuuuy)") == 4);
- assert(bus_gvariant_get_alignment("(uusuuy)") == 4);
- assert(bus_gvariant_get_alignment("a{ss}") == 1);
- assert(bus_gvariant_get_alignment("((u)yyy(b(iiii)))") == 4);
- assert(bus_gvariant_get_alignment("((u)yyy(b(iiivi)))") == 8);
- assert(bus_gvariant_get_alignment("((b)(t))") == 8);
- assert(bus_gvariant_get_alignment("((b)(b)(t))") == 8);
- assert(bus_gvariant_get_alignment("(bt)") == 8);
- assert(bus_gvariant_get_alignment("((t)(b))") == 8);
- assert(bus_gvariant_get_alignment("(tb)") == 8);
- assert(bus_gvariant_get_alignment("((b)(b))") == 1);
- assert(bus_gvariant_get_alignment("((t)(t))") == 8);
+ assert_se(bus_gvariant_get_alignment("") == 1);
+ assert_se(bus_gvariant_get_alignment("()") == 1);
+ assert_se(bus_gvariant_get_alignment("y") == 1);
+ assert_se(bus_gvariant_get_alignment("b") == 1);
+ assert_se(bus_gvariant_get_alignment("u") == 4);
+ assert_se(bus_gvariant_get_alignment("s") == 1);
+ assert_se(bus_gvariant_get_alignment("o") == 1);
+ assert_se(bus_gvariant_get_alignment("g") == 1);
+ assert_se(bus_gvariant_get_alignment("v") == 8);
+ assert_se(bus_gvariant_get_alignment("h") == 4);
+ assert_se(bus_gvariant_get_alignment("i") == 4);
+ assert_se(bus_gvariant_get_alignment("t") == 8);
+ assert_se(bus_gvariant_get_alignment("x") == 8);
+ assert_se(bus_gvariant_get_alignment("q") == 2);
+ assert_se(bus_gvariant_get_alignment("n") == 2);
+ assert_se(bus_gvariant_get_alignment("d") == 8);
+ assert_se(bus_gvariant_get_alignment("ay") == 1);
+ assert_se(bus_gvariant_get_alignment("as") == 1);
+ assert_se(bus_gvariant_get_alignment("au") == 4);
+ assert_se(bus_gvariant_get_alignment("an") == 2);
+ assert_se(bus_gvariant_get_alignment("ans") == 2);
+ assert_se(bus_gvariant_get_alignment("ant") == 8);
+ assert_se(bus_gvariant_get_alignment("(ss)") == 1);
+ assert_se(bus_gvariant_get_alignment("(ssu)") == 4);
+ assert_se(bus_gvariant_get_alignment("a(ssu)") == 4);
+ assert_se(bus_gvariant_get_alignment("(u)") == 4);
+ assert_se(bus_gvariant_get_alignment("(uuuuy)") == 4);
+ assert_se(bus_gvariant_get_alignment("(uusuuy)") == 4);
+ assert_se(bus_gvariant_get_alignment("a{ss}") == 1);
+ assert_se(bus_gvariant_get_alignment("((u)yyy(b(iiii)))") == 4);
+ assert_se(bus_gvariant_get_alignment("((u)yyy(b(iiivi)))") == 8);
+ assert_se(bus_gvariant_get_alignment("((b)(t))") == 8);
+ assert_se(bus_gvariant_get_alignment("((b)(b)(t))") == 8);
+ assert_se(bus_gvariant_get_alignment("(bt)") == 8);
+ assert_se(bus_gvariant_get_alignment("((t)(b))") == 8);
+ assert_se(bus_gvariant_get_alignment("(tb)") == 8);
+ assert_se(bus_gvariant_get_alignment("((b)(b))") == 1);
+ assert_se(bus_gvariant_get_alignment("((t)(t))") == 8);
}
static void test_marshal(void) {
diff --git a/src/libsystemd/sd-bus/test-bus-match.c b/src/libsystemd/sd-bus/test-bus-match.c
index 7133117..76ca0b6 100644
--- a/src/libsystemd/sd-bus/test-bus-match.c
+++ b/src/libsystemd/sd-bus/test-bus-match.c
@@ -19,8 +19,6 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <assert.h>
-
#include "log.h"
#include "util.h"
#include "macro.h"
@@ -34,7 +32,7 @@ static bool mask[32];
static int filter(sd_bus *b, sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
log_info("Ran %u", PTR_TO_UINT(userdata));
- assert(PTR_TO_UINT(userdata) < ELEMENTSOF(mask));
+ assert_se(PTR_TO_UINT(userdata) < ELEMENTSOF(mask));
mask[PTR_TO_UINT(userdata)] = true;
return 0;
}
diff --git a/src/libsystemd/sd-event/test-event.c b/src/libsystemd/sd-event/test-event.c
index ffefb14..721700b 100644
--- a/src/libsystemd/sd-event/test-event.c
+++ b/src/libsystemd/sd-event/test-event.c
@@ -22,6 +22,7 @@
#include "sd-event.h"
#include "log.h"
#include "util.h"
+#include "macro.h"
static int prepare_handler(sd_event_source *s, void *userdata) {
log_info("preparing %c", PTR_TO_INT(userdata));
@@ -62,12 +63,12 @@ static int io_handler(sd_event_source *s, int fd, uint32_t revents, void *userda
static int child_handler(sd_event_source *s, const siginfo_t *si, void *userdata) {
- assert(s);
- assert(si);
+ assert_se(s);
+ assert_se(si);
log_info("got child on %c", PTR_TO_INT(userdata));
- assert(userdata == INT_TO_PTR('f'));
+ assert_se(userdata == INT_TO_PTR('f'));
assert_se(sd_event_exit(sd_event_source_get_event(s), 0) >= 0);
sd_event_source_unref(s);
@@ -80,12 +81,12 @@ static int signal_handler(sd_event_source *s, const struct signalfd_siginfo *si,
sigset_t ss;
pid_t pid;
- assert(s);
- assert(si);
+ assert_se(s);
+ assert_se(si);
log_info("got signal on %c", PTR_TO_INT(userdata));
- assert(userdata == INT_TO_PTR('e'));
+ assert_se(userdata == INT_TO_PTR('e'));
assert_se(sigemptyset(&ss) >= 0);
assert_se(sigaddset(&ss, SIGCHLD) >= 0);
@@ -109,11 +110,11 @@ static int defer_handler(sd_event_source *s, void *userdata) {
sd_event_source *p = NULL;
sigset_t ss;
- assert(s);
+ assert_se(s);
log_info("got defer on %c", PTR_TO_INT(userdata));
- assert(userdata == INT_TO_PTR('d'));
+ assert_se(userdata == INT_TO_PTR('d'));
assert_se(sigemptyset(&ss) >= 0);
assert_se(sigaddset(&ss, SIGUSR1) >= 0);
@@ -140,7 +141,7 @@ static int time_handler(sd_event_source *s, uint64_t usec, void *userdata) {
assert_se(sd_event_add_defer(sd_event_source_get_event(s), &p, defer_handler, INT_TO_PTR('d')) >= 0);
assert_se(sd_event_source_set_enabled(p, SD_EVENT_ONESHOT) >= 0);
} else {
- assert(!got_c);
+ assert_se(!got_c);
got_c = true;
}
} else
diff --git a/src/libsystemd/sd-resolve/test-resolve.c b/src/libsystemd/sd-resolve/test-resolve.c
index a9dc931..d08e1b5 100644
--- a/src/libsystemd/sd-resolve/test-resolve.c
+++ b/src/libsystemd/sd-resolve/test-resolve.c
@@ -28,7 +28,6 @@
#include <netinet/in.h>
#include <arpa/nameser.h>
#include <resolv.h>
-#include <assert.h>
#include <signal.h>
#include <errno.h>
@@ -40,7 +39,7 @@
static int getaddrinfo_handler(sd_resolve_query *q, int ret, const struct addrinfo *ai, void *userdata) {
const struct addrinfo *i;
- assert(q);
+ assert_se(q);
if (ret != 0) {
log_error("getaddrinfo error: %s %i", gai_strerror(ret), ret);
@@ -60,7 +59,7 @@ static int getaddrinfo_handler(sd_resolve_query *q, int ret, const struct addrin
}
static int getnameinfo_handler(sd_resolve_query *q, int ret, const char *host, const char *serv, void *userdata) {
- assert(q);
+ assert_se(q);
if (ret != 0) {
log_error("getnameinfo error: %s %i", gai_strerror(ret), ret);
@@ -77,7 +76,7 @@ static int res_handler(sd_resolve_query *q, int ret, unsigned char *answer, void
unsigned char *end = answer + ret;
HEADER *head = (HEADER *) answer;
char name[256];
- assert(q);
+ assert_se(q);
if (ret < 0) {
log_error("res_query() error: %s %i", strerror(errno), errno);
@@ -96,7 +95,7 @@ static int res_handler(sd_resolve_query *q, int ret, unsigned char *answer, void
/* Ignore the questions */
while (qdcount-- > 0 && (len = dn_expand(answer, end, pos, name, 255)) >= 0) {
- assert(len >= 0);
+ assert_se(len >= 0);
pos += len + QFIXEDSZ;
}
@@ -104,7 +103,7 @@ static int res_handler(sd_resolve_query *q, int ret, unsigned char *answer, void
while (ancount-- > 0 && (len = dn_expand(answer, end, pos, name, 255)) >= 0) {
/* Ignore the initial string */
uint16_t pref, weight, port;
- assert(len >= 0);
+ assert_se(len >= 0);
pos += len;
/* Ignore type, ttl, class and dlen */
pos += 10;
diff --git a/src/resolve/test-dns-domain.c b/src/resolve/test-dns-domain.c
index dfe2a44..ebc8d98 100644
--- a/src/resolve/test-dns-domain.c
+++ b/src/resolve/test-dns-domain.c
@@ -20,6 +20,7 @@
***/
#include "log.h"
+#include "macro.h"
#include "resolved-dns-domain.h"
static void test_dns_label_unescape_one(const char *what, const char *expect, size_t buffer_sz, int ret) {
@@ -55,7 +56,7 @@ static void test_dns_label_escape_one(const char *what, size_t l, const char *ex
int r;
r = dns_label_escape(what, l, &t);
- assert(r == ret);
+ assert_se(r == ret);
if (r < 0)
return;
diff --git a/src/test/test-sigbus.c b/src/test/test-sigbus.c
index 39d0fec..f5bae65 100644
--- a/src/test/test-sigbus.c
+++ b/src/test/test-sigbus.c
@@ -32,7 +32,7 @@ int main(int argc, char *argv[]) {
sigbus_install();
- assert(sigbus_pop(&addr) == 0);
+ assert_se(sigbus_pop(&addr) == 0);
assert_se((fd = mkostemp(template, O_RDWR|O_CREAT|O_EXCL)) >= 0);
assert_se(unlink(template) >= 0);
diff --git a/src/test/test-util.c b/src/test/test-util.c
index a37316b..f2b7038 100644
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -1254,11 +1254,11 @@ static void test_execute_directory(void) {
execute_directories(dirs, DEFAULT_TIMEOUT_USEC, NULL);
- assert(chdir(template_lo) == 0);
+ assert_se(chdir(template_lo) == 0);
assert_se(access("it_works", F_OK) >= 0);
assert_se(access("failed", F_OK) < 0);
- assert(chdir(template_hi) == 0);
+ assert_se(chdir(template_hi) == 0);
assert_se(access("it_works2", F_OK) >= 0);
assert_se(access("failed", F_OK) < 0);
commit 714af6af8a912650f9129f8b056ed92589443060
Author: Sylvain Plantefève <sylvain.plantefeve at gmail.com>
Date: Thu Jan 22 21:51:46 2015 +0100
po: update french translation
diff --git a/po/fr.po b/po/fr.po
index 8a35822..4d4fc6b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,13 +1,13 @@
# French translations for systemd package
# Traductions françaises du paquet systemd.
# This file is distributed under the same license as the systemd package.
-# Sylvain Plantefève <sylvain.plantefeve at gmail.com>, 2013.
+# Sylvain Plantefève <sylvain.plantefeve at gmail.com>, 2013-2015
#
msgid ""
msgstr ""
"Project-Id-Version: systemd\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-28 13:02+0100\n"
+"POT-Creation-Date: 2015-01-22 16:03+0100\n"
"PO-Revision-Date: 2014-12-28 13:04+0100\n"
"Last-Translator: Sylvain Plantefève <sylvain.plantefeve at gmail.com>\n"
"Language-Team: French\n"
@@ -17,6 +17,42 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:1
+msgid "Send passphrase back to system"
+msgstr "Renvoyer la phrase secrète au système"
+
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:2
+msgid ""
+"Authentication is required to send the entered passphrase back to the system."
+msgstr "Authentification requise pour renvoyer la phrase secrète au système."
+
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:3
+msgid "Manage system services or units"
+msgstr "Gérer les services système ou les unités"
+
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:4
+msgid "Authentication is required to manage system services or units."
+msgstr ""
+"Authentification requise pour gérer les services système ou les unités."
+
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:5
+msgid "Manage system service or unit files"
+msgstr "Gérer le service système ou ses fichiers unités"
+
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:6
+msgid "Authentication is required to manage system service or unit files."
+msgstr ""
+"Authentification requise pour gérer le service système ou ses fichiers "
+"unités."
+
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:7
+msgid "Reload the systemd state"
+msgstr "Recharger l'état de systemd"
+
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:8
+msgid "Authentication is required to reload the systemd state."
+msgstr "Authentification requise pour recharger l'état de systemd"
+
#: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1
msgid "Set host name"
msgstr "Définir le nom d'hôte"
@@ -34,8 +70,8 @@ msgid ""
"Authentication is required to set the statically configured local host name, "
"as well as the pretty host name."
msgstr ""
-"Authentification requise pour définir le nom d'hôte local de manière statique, "
-"tout comme le nom d'hôte familier."
+"Authentification requise pour définir le nom d'hôte local de manière "
+"statique, tout comme le nom d'hôte familier."
#: ../src/hostname/org.freedesktop.hostname1.policy.in.h:5
msgid "Set machine information"
@@ -46,6 +82,16 @@ msgid "Authentication is required to set local machine information."
msgstr ""
"Authentification requise pour définir les informations sur la machine locale."
+#: ../src/import/org.freedesktop.import1.policy.in.h:1
+msgid "Download a VM or container image"
+msgstr "Télécharger une image de machine virtuelle (VM) ou de conteneur"
+
+#: ../src/import/org.freedesktop.import1.policy.in.h:2
+msgid "Authentication is required to download a VM or container image"
+msgstr ""
+"Authentification requise pour télécharger une image de "
+"machine virtuelle (VM) ou de conteneur."
+
#: ../src/locale/org.freedesktop.locale1.policy.in.h:1
msgid "Set system locale"
msgstr "Définir la langue du système"
@@ -60,7 +106,8 @@ msgstr "Définir les paramètres de clavier du système"
#: ../src/locale/org.freedesktop.locale1.policy.in.h:4
msgid "Authentication is required to set the system keyboard settings."
-msgstr "Authentification requise pour définir les paramètres de clavier du système."
+msgstr ""
+"Authentification requise pour définir les paramètres de clavier du système."
#: ../src/login/org.freedesktop.login1.policy.in.h:1
msgid "Allow applications to inhibit system shutdown"
@@ -68,8 +115,7 @@ msgstr "Permet aux applications d'empêcher l'arrêt du système"
#: ../src/login/org.freedesktop.login1.policy.in.h:2
msgid ""
-"Authentication is required for an application to inhibit system "
-"shutdown."
+"Authentication is required for an application to inhibit system shutdown."
msgstr ""
"Authentification requise pour permettre à une application d'empêcher l'arrêt "
"du système."
@@ -79,19 +125,17 @@ msgid "Allow applications to delay system shutdown"
msgstr "Permet aux applications de retarder l'arrêt du système"
#: ../src/login/org.freedesktop.login1.policy.in.h:4
-msgid ""
-"Authentication is required for an application to delay system shutdown."
+msgid "Authentication is required for an application to delay system shutdown."
msgstr ""
-"Authentification requise pour permettre à une application de retarder l'arrêt "
-"du système."
+"Authentification requise pour permettre à une application de retarder "
+"l'arrêt du système."
#: ../src/login/org.freedesktop.login1.policy.in.h:5
msgid "Allow applications to inhibit system sleep"
msgstr "Permet aux applications d'empêcher la mise en veille du système"
#: ../src/login/org.freedesktop.login1.policy.in.h:6
-msgid ""
-"Authentication is required for an application to inhibit system sleep."
+msgid "Authentication is required for an application to inhibit system sleep."
msgstr ""
"Authentification requise pour permettre à une application d'empêcher la mise "
"en veille du système."
@@ -101,33 +145,34 @@ msgid "Allow applications to delay system sleep"
msgstr "Permet aux applications de retarder la mise en veille du système"
#: ../src/login/org.freedesktop.login1.policy.in.h:8
-msgid ""
-"Authentication is required for an application to delay system sleep."
+msgid "Authentication is required for an application to delay system sleep."
msgstr ""
-"Authentification requise pour permettre à une application de retarder la mise "
-"en veille du système."
+"Authentification requise pour permettre à une application de retarder la "
+"mise en veille du système."
#: ../src/login/org.freedesktop.login1.policy.in.h:9
msgid "Allow applications to inhibit automatic system suspend"
-msgstr "Permet aux applications d'empêcher l'hibernation automatique du système"
+msgstr ""
+"Permet aux applications d'empêcher l'hibernation automatique du système"
#: ../src/login/org.freedesktop.login1.policy.in.h:10
msgid ""
-"Authentication is required for an application to inhibit automatic "
-"system suspend."
+"Authentication is required for an application to inhibit automatic system "
+"suspend."
msgstr ""
"Authentification requise pour permettre à une application d'empêcher "
"l'hibernation automatique du système."
#: ../src/login/org.freedesktop.login1.policy.in.h:11
msgid "Allow applications to inhibit system handling of the power key"
-msgstr "Permet aux applications d'empêcher la gestion du bouton d'alimentation "
-" du système"
+msgstr ""
+"Permet aux applications d'empêcher la gestion du bouton d'alimentation du "
+"système"
#: ../src/login/org.freedesktop.login1.policy.in.h:12
msgid ""
-"Authentication is required for an application to inhibit system "
-"handling of the power key."
+"Authentication is required for an application to inhibit system handling of "
+"the power key."
msgstr ""
"Authentification requise pour permettre à une application d'empêcher la "
"gestion du bouton d'alimentation du système."
@@ -140,11 +185,11 @@ msgstr ""
#: ../src/login/org.freedesktop.login1.policy.in.h:14
msgid ""
-"Authentication is required for an application to inhibit system "
-"handling of the suspend key."
+"Authentication is required for an application to inhibit system handling of "
+"the suspend key."
msgstr ""
-"Authentification requise pour permettre à une application d'empêcher la gestion "
-"du bouton de mise en veille du système."
+"Authentification requise pour permettre à une application d'empêcher la "
+"gestion du bouton de mise en veille du système."
#: ../src/login/org.freedesktop.login1.policy.in.h:15
msgid "Allow applications to inhibit system handling of the hibernate key"
@@ -154,11 +199,11 @@ msgstr ""
#: ../src/login/org.freedesktop.login1.policy.in.h:16
msgid ""
-"Authentication is required for an application to inhibit system "
-"handling of the hibernate key."
+"Authentication is required for an application to inhibit system handling of "
+"the hibernate key."
msgstr ""
-"Authentification requise pour permettre à une application d'empêcher la gestion "
-"du bouton d'hibernation du système."
+"Authentification requise pour permettre à une application d'empêcher la "
+"gestion du bouton d'hibernation du système."
#: ../src/login/org.freedesktop.login1.policy.in.h:17
msgid "Allow applications to inhibit system handling of the lid switch"
@@ -168,8 +213,8 @@ msgstr ""
#: ../src/login/org.freedesktop.login1.policy.in.h:18
msgid ""
-"Authentication is required for an application to inhibit system "
-"handling of the lid switch."
+"Authentication is required for an application to inhibit system handling of "
+"the lid switch."
msgstr ""
"Authentification requise pour permettre à une application d'empêcher la "
"gestion par le système du rabat de l'écran."
@@ -179,8 +224,7 @@ msgid "Allow non-logged-in users to run programs"
msgstr "Permet aux utilisateurs non connectés d'exécuter des programmes"
#: ../src/login/org.freedesktop.login1.policy.in.h:20
-msgid ""
-"Authentication is required to run programs as a non-logged-in user."
+msgid "Authentication is required to run programs as a non-logged-in user."
msgstr ""
"Authentification requise pour permettre aux utilisateurs non connectés "
"d'exécuter des programmes."
@@ -191,7 +235,8 @@ msgstr "Permet d'associer des périphériques à des postes (seats)"
#: ../src/login/org.freedesktop.login1.policy.in.h:22
msgid "Authentication is required for attaching a device to a seat."
-msgstr "Authentification requise pour associer un périphérique à un poste (seat)."
+msgstr ""
+"Authentification requise pour associer un périphérique à un poste (seat)."
#: ../src/login/org.freedesktop.login1.policy.in.h:23
msgid "Flush device to seat attachments"
@@ -201,8 +246,8 @@ msgstr "Révoquer les associations de périphériques aux postes (seats)"
msgid ""
"Authentication is required for resetting how devices are attached to seats."
msgstr ""
-"Authentification requise pour révoquer les associations de périphériques "
-"aux postes (seats)."
+"Authentification requise pour révoquer les associations de périphériques aux "
+"postes (seats)."
#: ../src/login/org.freedesktop.login1.policy.in.h:25
msgid "Power off the system"
@@ -233,8 +278,8 @@ msgid ""
"Authentication is required for powering off the system while an application "
"asked to inhibit it."
msgstr ""
-"Authentification requise pour éteindre le système alors qu'une application "
-"a demandé de l'empêcher."
+"Authentification requise pour éteindre le système alors qu'une application a "
+"demandé de l'empêcher."
#: ../src/login/org.freedesktop.login1.policy.in.h:31
msgid "Reboot the system"
@@ -265,8 +310,8 @@ msgid ""
"Authentication is required for rebooting the system while an application "
"asked to inhibit it."
msgstr ""
-"Authentification requise pour redémarrer le système alors qu'une application "
-" a demandé de l'empêcher."
+"Authentification requise pour redémarrer le système alors qu'une "
+"application a demandé de l'empêcher."
#: ../src/login/org.freedesktop.login1.policy.in.h:37
msgid "Suspend the system"
@@ -278,19 +323,21 @@ msgstr "Authentification requise pour mettre le système en veille."
#: ../src/login/org.freedesktop.login1.policy.in.h:39
msgid "Suspend the system while other users are logged in"
-msgstr "Mettre le système en veille alors que d'autres utilisateurs sont connectés"
+msgstr ""
+"Mettre le système en veille alors que d'autres utilisateurs sont connectés"
#: ../src/login/org.freedesktop.login1.policy.in.h:40
msgid ""
"Authentication is required for suspending the system while other users are "
"logged in."
msgstr ""
-"Authentification requise pour mettre le système en veille alors que "
-"d'autres utilisateurs sont connectés."
+"Authentification requise pour mettre le système en veille alors que d'autres "
+"utilisateurs sont connectés."
#: ../src/login/org.freedesktop.login1.policy.in.h:41
msgid "Suspend the system while an application asked to inhibit it"
-msgstr "Mettre le système en veille alors qu'une application a demandé de l'empêcher"
+msgstr ""
+"Mettre le système en veille alors qu'une application a demandé de l'empêcher"
#: ../src/login/org.freedesktop.login1.policy.in.h:42
msgid ""
@@ -310,7 +357,9 @@ msgstr "Authentification requise pour mettre le système en hibernation."
#: ../src/login/org.freedesktop.login1.policy.in.h:45
msgid "Hibernate the system while other users are logged in"
-msgstr "Mettre le système en hibernation alors que d'autres utilisateurs sont connectés"
+msgstr ""
+"Mettre le système en hibernation alors que d'autres utilisateurs sont "
+"connectés"
#: ../src/login/org.freedesktop.login1.policy.in.h:46
msgid ""
@@ -339,7 +388,7 @@ msgid "Log into a local container"
msgstr "Connexion dans un conteneur local"
#: ../src/machine/org.freedesktop.machine1.policy.in.h:2
-msgid "Authentication is required to log into a local container."
+msgid "Authentication is required to log into a local container"
msgstr ""
"Authentification requise pour permettre la connexion dans un conteneur local."
@@ -370,8 +419,8 @@ msgid ""
"Authentication is required to control whether the RTC stores the local or "
"UTC time."
msgstr ""
-"Authentification requise pour positionner l'horloge matérielle à l'heure locale "
-"ou sur le temps universel coordonné (UTC)."
+"Authentification requise pour positionner l'horloge matérielle à l'heure "
+"locale ou sur le temps universel coordonné (UTC)."
#: ../src/timedate/org.freedesktop.timedate1.policy.in.h:7
msgid "Turn network time synchronization on or off"
@@ -382,41 +431,5 @@ msgid ""
"Authentication is required to control whether network time synchronization "
"shall be enabled."
msgstr ""
-"Authentification requise pour activer ou désactiver la synchronisation "
-"de l'heure avec le réseau."
-
-#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:1
-msgid "Send passphrase back to system"
-msgstr "Renvoyer la phrase secrète au système"
-
-#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:2
-msgid ""
-"Authentication is required to send the entered passphrase back to the system."
-msgstr ""
-"Authentification requise pour renvoyer la phrase secrète au système."
-
-#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:3
-msgid "Manage system services or units"
-msgstr "Gérer les services système ou les unités"
-
-#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:4
-msgid "Authentication is required to manage system services or units."
-msgstr ""
-"Authentification requise pour gérer les services système ou les unités."
-
-#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:5
-msgid "Manage system service or unit files"
-msgstr "Gérer le service système ou ses fichiers unités"
-
-#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:6
-msgid "Authentication is required to manage system service or unit files."
-msgstr ""
-"Authentification requise pour gérer le service système ou ses fichiers unités."
-
-#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:7
-msgid "Reload the systemd state"
-msgstr "Recharger l'état de systemd"
-
-#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:8
-msgid "Authentication is required to reload the systemd state."
-msgstr "Authentification requise pour recharger l'état de systemd"
+"Authentification requise pour activer ou désactiver la synchronisation de "
+"l'heure avec le réseau."
commit 06d99637b8d62de431d08105ccf57e5089bee5b3
Author: Sylvain Plantefève <sylvain.plantefeve at gmail.com>
Date: Thu Jan 22 21:51:45 2015 +0100
catalog: update french translation
diff --git a/catalog/systemd.fr.catalog b/catalog/systemd.fr.catalog
index e9dfca7..03a4577 100644
--- a/catalog/systemd.fr.catalog
+++ b/catalog/systemd.fr.catalog
@@ -1,7 +1,7 @@
# This file is part of systemd.
#
# Copyright 2012 Lennart Poettering
-# Copyright 2013 Sylvain Plantefève
+# Copyright 2013-2015 Sylvain Plantefève
#
# systemd is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
@@ -23,7 +23,7 @@
# http://www.freedesktop.org/wiki/Software/systemd/catalog
-- f77379a8490b408bbe5f6940505a777b
-Subject: Le Journal a été démarré
+Subject: Le journal a été démarré
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
@@ -31,7 +31,7 @@ Le processus du journal système a démarré, ouvert ses fichiers en écriture
et est prêt à traiter les requêtes.
-- d93fb3c9c24d451a97cea615ce59c00b
-Subject: Le Journal a été arrêté
+Subject: Le journal a été arrêté
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
@@ -55,7 +55,7 @@ paramètres RateLimitInterval= et RateLimitBurst= dans le fichier
/etc/systemd/journald.conf. Voir journald.conf(5) pour plus de détails.
-- e9bf28e6e834481bb6f48f548ad13606
-Subject: Des messages du Journal ont été manqués
+Subject: Des messages du journal ont été manqués
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
commit 9b0374e954f504701fbe5d3f68d65360139ca2f9
Author: Ronny Chevalier <chevalier.ronny at gmail.com>
Date: Sun Jan 18 23:23:38 2015 +0100
man: fix typos
diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml
index b050a17..3c9fe6a 100644
--- a/man/systemd.resource-control.xml
+++ b/man/systemd.resource-control.xml
@@ -65,7 +65,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
sockets, mount points, and swap devices share a subset of
configuration options for resource control of spawned
processes. Internally, this relies on the Control Groups
- kernel concept for organizing processes in a hierarchial tree of
+ kernel concept for organizing processes in a hierarchical tree of
named groups for the purpose of resource management.</para>
<para>This man page lists the configuration options shared by
@@ -132,7 +132,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<varname>CPUShares=</varname> applies to normal runtime of
the system, and if the former is not set also to the startup
phase. Using <varname>StartupCPUShares=</varname> allows
- priorizing specific services at boot-up differently than
+ prioritizing specific services at boot-up differently than
during normal runtime.</para>
<para>Those options imply
@@ -148,7 +148,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
executed. Takes a percentage value, suffixed with "%". The
percentage specifies how much CPU time the unit shall get at
maximum, relative to the total CPU time available on one
- CPU. Use values > 100% for alloting CPU time on more than
+ CPU. Use values > 100% for allotting CPU time on more than
one CPU. This controls the
<literal>cpu.cfs_quota_us</literal> control group
attribute. For details about this control group attribute,
@@ -230,7 +230,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
applies to the startup phase of the system,
<varname>BlockIOWeight=</varname> applies to the later runtime
of the system, and if the former is not set also to the
- startup phase. This allows priorizing specific services at
+ startup phase. This allows prioritizing specific services at
boot-up differently than during runtime.</para>
<para>Implies
@@ -399,10 +399,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<listitem>
<para>Turns on delegation of further resource control
- partitioning to processes of the unit. For unpriviliged
+ partitioning to processes of the unit. For unprivileged
services (i.e. those using the <varname>User=</varname>
setting) this allows processes to create a subhierarchy
- beneath its control group path. For priviliged services and
+ beneath its control group path. For privileged services and
scopes this ensures the processes will have all control
group controllers enabled.</para>
</listitem>
More information about the systemd-commits
mailing list