chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove unused includes
[elogind.git]
/
src
/
journal
/
catalog.c
diff --git
a/src/journal/catalog.c
b/src/journal/catalog.c
index 41cdb0dadeb3ae5bf8bf6d57e14467168b520fbb..e505a05305fe241e49069e7e99b31a312ddf4f10 100644
(file)
--- a/
src/journal/catalog.c
+++ b/
src/journal/catalog.c
@@
-26,7
+26,6
@@
#include <string.h>
#include <sys/mman.h>
#include <locale.h>
#include <string.h>
#include <sys/mman.h>
#include <locale.h>
-#include <libgen.h>
#include "util.h"
#include "log.h"
#include "util.h"
#include "log.h"
@@
-35,7
+34,6
@@
#include "hashmap.h"
#include "strv.h"
#include "strbuf.h"
#include "hashmap.h"
#include "strv.h"
#include "strbuf.h"
-#include "strxcpyx.h"
#include "conf-files.h"
#include "mkdir.h"
#include "catalog.h"
#include "conf-files.h"
#include "mkdir.h"
#include "catalog.h"
@@
-209,10
+207,8
@@
int catalog_import_file(Hashmap *h, struct strbuf *sb, const char *path) {
assert(path);
f = fopen(path, "re");
assert(path);
f = fopen(path, "re");
- if (!f) {
- log_error_errno(errno, "Failed to open file %s: %m", path);
- return -errno;
- }
+ if (!f)
+ return log_error_errno(errno, "Failed to open file %s: %m", path);
r = catalog_file_lang(path, &deflang);
if (r < 0)
r = catalog_file_lang(path, &deflang);
if (r < 0)