dcavalca / rpms / systemd

Forked from rpms/systemd 4 months ago
Clone
Zbigniew Jędrzejewski-Szmek 62fe94
From b88a40a7e592e0a4a2e6e8eb1ed3721989ba5d0e Mon Sep 17 00:00:00 2001
Zbigniew Jędrzejewski-Szmek 62fe94
From: Philippe De Swert <philippedeswert@gmail.com>
Zbigniew Jędrzejewski-Szmek 62fe94
Date: Thu, 18 Sep 2014 18:56:55 +0300
Zbigniew Jędrzejewski-Szmek 62fe94
Subject: [PATCH] journal-upload: Remove compilation warning
Zbigniew Jędrzejewski-Szmek 62fe94
MIME-Version: 1.0
Zbigniew Jędrzejewski-Szmek 62fe94
Content-Type: text/plain; charset=UTF-8
Zbigniew Jędrzejewski-Szmek 62fe94
Content-Transfer-Encoding: 8bit
Zbigniew Jędrzejewski-Szmek 62fe94
Zbigniew Jędrzejewski-Szmek 62fe94
When compiling we see this curl warning popping up:
Zbigniew Jędrzejewski-Szmek 62fe94
src/journal-remote/journal-upload.c:194:17: warning: call to
Zbigniew Jędrzejewski-Szmek 62fe94
‘_curl_easy_setopt_err_error_buffer’ declared with attribute
Zbigniew Jędrzejewski-Szmek 62fe94
warning: curl_easy_setopt expects a char buffer of CURL_ERROR_SIZE
Zbigniew Jędrzejewski-Szmek 62fe94
as argument for this option [enabled by default]
Zbigniew Jędrzejewski-Szmek 62fe94
This patch removes the warning (which occurs twice).
Zbigniew Jędrzejewski-Szmek 62fe94
---
Zbigniew Jędrzejewski-Szmek 62fe94
 src/journal-remote/journal-upload.c | 2 +-
Zbigniew Jędrzejewski-Szmek 62fe94
 1 file changed, 1 insertion(+), 1 deletion(-)
Zbigniew Jędrzejewski-Szmek 62fe94
Zbigniew Jędrzejewski-Szmek 62fe94
diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c
Zbigniew Jędrzejewski-Szmek 62fe94
index 40c380aa9e..e16204484e 100644
Zbigniew Jędrzejewski-Szmek 62fe94
--- a/src/journal-remote/journal-upload.c
Zbigniew Jędrzejewski-Szmek 62fe94
+++ b/src/journal-remote/journal-upload.c
Zbigniew Jędrzejewski-Szmek 62fe94
@@ -191,7 +191,7 @@ int start_upload(Uploader *u,
Zbigniew Jędrzejewski-Szmek 62fe94
                 easy_setopt(curl, CURLOPT_POST, 1L,
Zbigniew Jędrzejewski-Szmek 62fe94
                             LOG_ERR, return -EXFULL);
Zbigniew Jędrzejewski-Szmek 62fe94
 
Zbigniew Jędrzejewski-Szmek 62fe94
-                easy_setopt(curl, CURLOPT_ERRORBUFFER, &u->error,
Zbigniew Jędrzejewski-Szmek 62fe94
+                easy_setopt(curl, CURLOPT_ERRORBUFFER, u->error,
Zbigniew Jędrzejewski-Szmek 62fe94
                             LOG_ERR, return -EXFULL);
Zbigniew Jędrzejewski-Szmek 62fe94
 
Zbigniew Jędrzejewski-Szmek 62fe94
                 /* set where to write to */