chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-bus: rename "connection name" to "description" for the sd-bus API too
[elogind.git]
/
src
/
journal
/
test-catalog.c
diff --git
a/src/journal/test-catalog.c
b/src/journal/test-catalog.c
index ffe180265bf476c4405c47f43eaabf067c6377e1..5fe2f6a2697e6bb65ba264b2c274e297a013293a 100644
(file)
--- a/
src/journal/test-catalog.c
+++ b/
src/journal/test-catalog.c
@@
-24,6
+24,7
@@
#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
+#include <fcntl.h>
#include "util.h"
#include "log.h"
#include "util.h"
#include "log.h"
@@
-45,7
+46,9
@@
static void test_import(Hashmap *h, struct strbuf *sb,
const char* contents, ssize_t size, int code) {
int r;
char name[] = "/tmp/test-catalog.XXXXXX";
const char* contents, ssize_t size, int code) {
int r;
char name[] = "/tmp/test-catalog.XXXXXX";
- _cleanup_close_ int fd = mkstemp(name);
+ _cleanup_close_ int fd;
+
+ fd = mkostemp_safe(name, O_RDWR|O_CLOEXEC);
assert(fd >= 0);
assert_se(write(fd, contents, size) == size);
assert(fd >= 0);
assert_se(write(fd, contents, size) == size);
@@
-59,7
+62,7
@@
static void test_catalog_importing(void) {
Hashmap *h;
struct strbuf *sb;
Hashmap *h;
struct strbuf *sb;
- assert_se(h = hashmap_new(
catalog_hash_func, catalog_compare_func
));
+ assert_se(h = hashmap_new(
&catalog_hash_ops
));
assert_se(sb = strbuf_new());
#define BUF "xxx"
assert_se(sb = strbuf_new());
#define BUF "xxx"
@@
-98,10
+101,10
@@
static void test_catalog_importing(void) {
static const char* database = NULL;
static void test_catalog_update(void) {
static const char* database = NULL;
static void test_catalog_update(void) {
+ static char name[] = "/tmp/test-catalog.XXXXXX";
int r;
int r;
- static char name[] = "/tmp/test-catalog.XXXXXX";
- r = mkstemp(name);
+ r = mkostemp_safe(name, O_RDWR|O_CLOEXEC);
assert(r >= 0);
database = name;
assert(r >= 0);
database = name;
@@
-154,7
+157,8
@@
int main(int argc, char *argv[]) {
setlocale(LC_ALL, "de_DE.UTF-8");
setlocale(LC_ALL, "de_DE.UTF-8");
- log_set_max_level(LOG_DEBUG);
+ log_parse_environment();
+ log_open();
test_catalog_file_lang();
test_catalog_file_lang();