[systemd-commits] 4 commits - Makefile.am src/core src/shared src/test src/tmpfiles
Zbigniew Jędrzejewski-Szmek
zbyszek at kemper.freedesktop.org
Wed Oct 1 06:35:25 PDT 2014
Makefile.am | 7 +++++++
src/core/main.c | 2 +-
src/shared/util.c | 9 ++-------
src/test/test-hashmap.c | 21 +++++++++++++++++++++
src/test/test-set.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++
src/tmpfiles/tmpfiles.c | 6 +++++-
6 files changed, 83 insertions(+), 9 deletions(-)
New commits:
commit 647f68249f90855814de6eb6b0959c6096b41cae
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Wed Oct 1 09:32:16 2014 -0400
tests: add tests for {hashmap,set}_steal_first
Just to make sure that coverity is wrong.
diff --git a/Makefile.am b/Makefile.am
index 7bb7f75..9e087bd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1341,6 +1341,7 @@ tests += \
test-fileio \
test-time \
test-hashmap \
+ test-set \
test-list \
test-tables \
test-device-nodes \
@@ -1572,6 +1573,12 @@ test_hashmap_SOURCES = \
test_hashmap_LDADD = \
libsystemd-core.la
+test_set_SOURCES = \
+ src/test/test-set.c
+
+test_set_LDADD = \
+ libsystemd-core.la
+
test_xml_SOURCES = \
src/test/test-xml.c
diff --git a/src/test/test-hashmap.c b/src/test/test-hashmap.c
index d9863f8..f4afbb8 100644
--- a/src/test/test-hashmap.c
+++ b/src/test/test-hashmap.c
@@ -507,6 +507,26 @@ static void test_hashmap_steal_first_key(void) {
assert_se(hashmap_isempty(m));
}
+static void test_hashmap_steal_first(void) {
+ _cleanup_hashmap_free_ Hashmap *m = NULL;
+ int seen[3] = {};
+ char *val;
+
+ m = hashmap_new(&string_hash_ops);
+ assert_se(m);
+
+ assert_se(hashmap_put(m, "key 1", (void*) "1") == 1);
+ assert_se(hashmap_put(m, "key 2", (void*) "22") == 1);
+ assert_se(hashmap_put(m, "key 3", (void*) "333") == 1);
+
+ while ((val = hashmap_steal_first(m)))
+ seen[strlen(val) - 1]++;
+
+ assert(seen[0] == 1 && seen[1] == 1 && seen[2] == 1);
+
+ assert_se(hashmap_isempty(m));
+}
+
static void test_hashmap_clear_free_free(void) {
_cleanup_hashmap_free_ Hashmap *m = NULL;
@@ -560,6 +580,7 @@ int main(int argc, const char *argv[]) {
test_hashmap_many();
test_hashmap_first_key();
test_hashmap_steal_first_key();
+ test_hashmap_steal_first();
test_hashmap_clear_free_free();
test_uint64_compare_func();
test_trivial_compare_func();
diff --git a/src/test/test-set.c b/src/test/test-set.c
new file mode 100644
index 0000000..060dba4
--- /dev/null
+++ b/src/test/test-set.c
@@ -0,0 +1,47 @@
+/***
+ This file is part of systemd
+
+ Copyright 2014 Zbigniew Jędrzejewski-Szmek
+
+ 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
+ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include "util.h"
+#include "set.h"
+
+static void test_set_steal_first(void) {
+ _cleanup_set_free_ Set *m = NULL;
+ int seen[3] = {};
+ char *val;
+
+ m = set_new(&string_hash_ops);
+ assert_se(m);
+
+ assert_se(set_put(m, (void*) "1") == 1);
+ assert_se(set_put(m, (void*) "22") == 1);
+ assert_se(set_put(m, (void*) "333") == 1);
+
+ while ((val = set_steal_first(m)))
+ seen[strlen(val) - 1]++;
+
+ assert(seen[0] == 1 && seen[1] == 1 && seen[2] == 1);
+
+ assert_se(set_isempty(m));
+}
+
+int main(int argc, const char *argv[]) {
+ test_set_steal_first();
+
+ return 0;
+}
commit acb3b3ddc082880eaaa1d7773296ad9abd756f23
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Tue Sep 30 07:44:04 2014 -0400
shared: util - use nicer idiom to silence Coverity
Change the other spot too.
diff --git a/src/shared/util.c b/src/shared/util.c
index ebacee5..bbd9bd1 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -3306,13 +3306,8 @@ unsigned lines(void) {
l = 0;
e = getenv("LINES");
- if (e) {
- int r;
-
- r = safe_atou(e, &l);
- if (r < 0) {}
- /* do nothing, we fall back to l = 0 */
- }
+ if (e)
+ (void) safe_atou(e, &l);
if (l <= 0)
l = fd_lines(STDOUT_FILENO);
commit 9348f0e690c28f86a69c96e3e9b9f19a31c6d466
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Wed Oct 1 07:33:22 2014 -0500
tmpfiles: use allocated buffer for path
Paths can in principle be longer then PATH_MAX, so
simply allocate the buffer with malloc().
CID #1237773
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 7eafd6b..dafb9ae 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -1064,7 +1064,7 @@ static int clean_item(Item *i) {
static int process_item(Item *i) {
int r, q, p;
- char prefix[PATH_MAX];
+ _cleanup_free_ char *prefix = NULL;
assert(i);
@@ -1073,6 +1073,10 @@ static int process_item(Item *i) {
i->done = true;
+ prefix = malloc(strlen(i->path) + 1);
+ if (!prefix)
+ return log_oom();
+
PATH_FOREACH_PREFIX(prefix, i->path) {
Item *j;
commit fdb14b7ef40d1f19f3bd7c8fa2a3821c2be87a5e
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Wed Oct 1 07:34:05 2014 -0500
core: limit timestamp to sane precision
Anything below .1 s is meaningless anyway.
diff --git a/src/core/main.c b/src/core/main.c
index 64c2b3f..1a62e04 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1725,7 +1725,7 @@ int main(int argc, char *argv[]) {
after_startup = now(CLOCK_MONOTONIC);
log_full(arg_action == ACTION_TEST ? LOG_INFO : LOG_DEBUG,
"Loaded units and determined initial transaction in %s.",
- format_timespan(timespan, sizeof(timespan), after_startup - before_startup, 0));
+ format_timespan(timespan, sizeof(timespan), after_startup - before_startup, 100 * USEC_PER_MSEC));
if (arg_action == ACTION_TEST) {
printf("-> By jobs:\n");
More information about the systemd-commits
mailing list