chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: gracefully handle failure to emit signals when dbus is not connected
[elogind.git]
/
src
/
journal-remote
/
microhttpd-util.c
diff --git
a/src/journal-remote/microhttpd-util.c
b/src/journal-remote/microhttpd-util.c
index 3df34b2323f39b5438e287f08cf1cbff248997cf..34d93379dacea1a35740b2977405bd037283d340 100644
(file)
--- a/
src/journal-remote/microhttpd-util.c
+++ b/
src/journal-remote/microhttpd-util.c
@@
-38,7
+38,7
@@
void microhttpd_logger(void *arg, const char *fmt, va_list ap) {
char *f;
void microhttpd_logger(void *arg, const char *fmt, va_list ap) {
char *f;
- f = str
append
a("microhttpd: ", fmt);
+ f = str
join
a("microhttpd: ", fmt);
DISABLE_WARNING_FORMAT_NONLITERAL;
log_internalv(LOG_INFO, 0, NULL, 0, NULL, f, ap);
DISABLE_WARNING_FORMAT_NONLITERAL;
log_internalv(LOG_INFO, 0, NULL, 0, NULL, f, ap);
@@
-170,17
+170,13
@@
static int verify_cert_authorized(gnutls_session_t session) {
int r;
r = gnutls_certificate_verify_peers2(session, &status);
int r;
r = gnutls_certificate_verify_peers2(session, &status);
- if (r < 0) {
- log_error_errno(-r, "gnutls_certificate_verify_peers2 failed: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "gnutls_certificate_verify_peers2 failed: %m");
type = gnutls_certificate_type_get(session);
r = gnutls_certificate_verification_status_print(status, type, &out, 0);
type = gnutls_certificate_type_get(session);
r = gnutls_certificate_verification_status_print(status, type, &out, 0);
- if (r < 0) {
- log_error_errno(-r, "gnutls_certificate_verification_status_print failed: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "gnutls_certificate_verification_status_print failed: %m");
log_info("Certificate status: %s", out.data);
log_info("Certificate status: %s", out.data);