Re: [ABRT PATCH] abrt-*-client: simplify formatting of locale-related headers

2013-09-12 Thread Michal Toman 

Pushed with one minor change

On 09.09.2013 14:31, Denys Vlasenko  wrote:

@@ -382,21 +382,14 @@ static int check_package(const char *nvr, const char 
*arch, map_string_t *osinfo
 X-Package-NVR: %s\r\n
 X-Package-Arch: %s\r\n
 X-OS-Release: %s\r\n,

   removed the excessive comma   ^

-   cfg.url, nvr, arch, releaseid);
-
-if (lang.encoding)
-strbuf_append_strf(http_request,
-   Accept-Charset: %s\r\n,
-   lang.encoding);
-if (lang.locale)
-{
-strbuf_append_strf(http_request,
-   Accept-Language: %s\r\n,
-   lang.locale);
-free(lang.locale);
-}
+   %s
+   %s
+   \r\n,
+   cfg.url, nvr, arch, releaseid,
+   lang.accept_charset,
+   lang.accept_language
+);

Re: [ABRT PATCH] abrt-*-client: simplify formatting of locale-related headers

2013-09-11 Thread Jakub Filak 
I'd like to release updated ABRT packages but I'm not sure if I should
wait for this patch or not because I'm not sure what is the purpose of
this patch? Is this patch related to any bugzilla bug or github issue?


On Mon, 2013-09-09 at 14:31 +0200, Denys Vlasenko wrote:
 Signed-off-by: Denys Vlasenko dvlas...@redhat.com
 ---
  src/plugins/abrt-dedup-client.c   |  24 ---
  src/plugins/abrt-retrace-client.c | 134 
 --
  src/plugins/https-utils.c |  17 -
  src/plugins/https-utils.h |   4 +-
  4 files changed, 72 insertions(+), 107 deletions(-)
 
 diff --git a/src/plugins/abrt-dedup-client.c b/src/plugins/abrt-dedup-client.c
 index 835d551..830efda 100644
 --- a/src/plugins/abrt-dedup-client.c
 +++ b/src/plugins/abrt-dedup-client.c
 @@ -171,19 +171,17 @@ int main(int argc, char **argv)
 Host: %s\r\n
 Content-Type: application/x-www-form-urlencoded\r\n
 Content-Length: %d\r\n
 -   Connection: close\r\n,
 -   cfg.url, request_body-len);
 -
 -if (lang.encoding)
 -strbuf_append_strf(request, Accept-Charset: %s\r\n, lang.encoding);
 -
 -if (lang.locale)
 -{
 -strbuf_append_strf(request, Accept-Language: %s\r\n, lang.locale);
 -free(lang.locale);
 -}
 -
 -strbuf_append_strf(request, \r\n%s, request_body-buf);
 +   Connection: close\r\n
 +   %s
 +   %s
 +   \r\n,
 +   cfg.url,
 +   request_body-len,
 +   lang.accept_charset,
 +   lang.accept_language
 +);
 +
 +strbuf_append_str(request, request_body-buf);
  strbuf_free(request_body);
  
  /* Initialize NSS */
 diff --git a/src/plugins/abrt-retrace-client.c 
 b/src/plugins/abrt-retrace-client.c
 index 940939b..cc0b802 100644
 --- a/src/plugins/abrt-retrace-client.c
 +++ b/src/plugins/abrt-retrace-client.c
 @@ -29,6 +29,8 @@ enum
  TASK_VMCORE,
  };
  
 +static struct language lang;
 +
  struct retrace_settings
  {
  int running_tasks;
 @@ -369,8 +371,6 @@ static int check_package(const char *nvr, const char 
 *arch, map_string_t *osinfo
  {
  char *releaseid = get_release_id(osinfo, arch);
  
 -struct language lang;
 -get_language(lang);
  PRFileDesc *tcp_sock, *ssl_sock;
  ssl_connect(cfg, tcp_sock, ssl_sock);
  struct strbuf *http_request = strbuf_new();
 @@ -382,21 +382,14 @@ static int check_package(const char *nvr, const char 
 *arch, map_string_t *osinfo
 X-Package-NVR: %s\r\n
 X-Package-Arch: %s\r\n
 X-OS-Release: %s\r\n,
 -   cfg.url, nvr, arch, releaseid);
 -
 -if (lang.encoding)
 -strbuf_append_strf(http_request,
 -   Accept-Charset: %s\r\n,
 -   lang.encoding);
 -if (lang.locale)
 -{
 -strbuf_append_strf(http_request,
 -   Accept-Language: %s\r\n,
 -   lang.locale);
 -free(lang.locale);
 -}
 +   %s
 +   %s
 +   \r\n,
 +   cfg.url, nvr, arch, releaseid,
 +   lang.accept_charset,
 +   lang.accept_language
 +);
  
 -strbuf_append_str(http_request, \r\n);
  PRInt32 written = PR_Send(tcp_sock, http_request-buf, http_request-len,
/*flags:*/0, PR_INTERVAL_NO_TIMEOUT);
  if (written == -1)
 @@ -446,9 +439,6 @@ static int create(bool delete_temp_archive,
char **task_id,
char **task_password)
  {
 -struct language lang;
 -get_language(lang);
 -
  if (delay)
  {
  puts(_(Querying server settings));
 @@ -659,22 +649,14 @@ static int create(bool delete_temp_archive,
 Content-Type: application/x-xz-compressed-tar\r\n
 Content-Length: %lld\r\n
 Connection: close\r\n
 -   X-Task-Type: %d\r\n,
 -   cfg.url, (long long)file_stat.st_size, task_type);
 -
 -if (lang.encoding)
 -strbuf_append_strf(http_request,
 -   Accept-Charset: %s\r\n,
 -   lang.encoding);
 -if (lang.locale)
 -{
 -strbuf_append_strf(http_request,
 -   Accept-Language: %s\r\n,
 -   lang.locale);
 -free(lang.locale);
 -}
 -
 -strbuf_append_str(http_request, \r\n);
 +   X-Task-Type: %d\r\n
 +   %s
 +   %s
 +   \r\n,
 +   cfg.url, (long long)file_stat.st_size, task_type,
 +

Re: [ABRT PATCH] abrt-*-client: simplify formatting of locale-related headers

2013-09-11 Thread Denys Vlasenko 
On 09/11/2013 10:32 AM, Jakub Filak wrote:
 I'd like to release updated ABRT packages but I'm not sure if I should
 wait for this patch or not because I'm not sure what is the purpose of
 this patch? Is this patch related to any bugzilla bug or github issue?

It is a simplification. It does not fix any bugs.

Since Michal is the principal author of this code,
I think it's his right to decide whether it looks ok there.

[ABRT PATCH] abrt-*-client: simplify formatting of locale-related headers

2013-09-09 Thread Denys Vlasenko 
Signed-off-by: Denys Vlasenko dvlas...@redhat.com
---
 src/plugins/abrt-dedup-client.c   |  24 ---
 src/plugins/abrt-retrace-client.c | 134 --
 src/plugins/https-utils.c |  17 -
 src/plugins/https-utils.h |   4 +-
 4 files changed, 72 insertions(+), 107 deletions(-)

diff --git a/src/plugins/abrt-dedup-client.c b/src/plugins/abrt-dedup-client.c
index 835d551..830efda 100644
--- a/src/plugins/abrt-dedup-client.c
+++ b/src/plugins/abrt-dedup-client.c
@@ -171,19 +171,17 @@ int main(int argc, char **argv)
Host: %s\r\n
Content-Type: application/x-www-form-urlencoded\r\n
Content-Length: %d\r\n
-   Connection: close\r\n,
-   cfg.url, request_body-len);
-
-if (lang.encoding)
-strbuf_append_strf(request, Accept-Charset: %s\r\n, lang.encoding);
-
-if (lang.locale)
-{
-strbuf_append_strf(request, Accept-Language: %s\r\n, lang.locale);
-free(lang.locale);
-}
-
-strbuf_append_strf(request, \r\n%s, request_body-buf);
+   Connection: close\r\n
+   %s
+   %s
+   \r\n,
+   cfg.url,
+   request_body-len,
+   lang.accept_charset,
+   lang.accept_language
+);
+
+strbuf_append_str(request, request_body-buf);
 strbuf_free(request_body);
 
 /* Initialize NSS */
diff --git a/src/plugins/abrt-retrace-client.c 
b/src/plugins/abrt-retrace-client.c
index 940939b..cc0b802 100644
--- a/src/plugins/abrt-retrace-client.c
+++ b/src/plugins/abrt-retrace-client.c
@@ -29,6 +29,8 @@ enum
 TASK_VMCORE,
 };
 
+static struct language lang;
+
 struct retrace_settings
 {
 int running_tasks;
@@ -369,8 +371,6 @@ static int check_package(const char *nvr, const char *arch, 
map_string_t *osinfo
 {
 char *releaseid = get_release_id(osinfo, arch);
 
-struct language lang;
-get_language(lang);
 PRFileDesc *tcp_sock, *ssl_sock;
 ssl_connect(cfg, tcp_sock, ssl_sock);
 struct strbuf *http_request = strbuf_new();
@@ -382,21 +382,14 @@ static int check_package(const char *nvr, const char 
*arch, map_string_t *osinfo
X-Package-NVR: %s\r\n
X-Package-Arch: %s\r\n
X-OS-Release: %s\r\n,
-   cfg.url, nvr, arch, releaseid);
-
-if (lang.encoding)
-strbuf_append_strf(http_request,
-   Accept-Charset: %s\r\n,
-   lang.encoding);
-if (lang.locale)
-{
-strbuf_append_strf(http_request,
-   Accept-Language: %s\r\n,
-   lang.locale);
-free(lang.locale);
-}
+   %s
+   %s
+   \r\n,
+   cfg.url, nvr, arch, releaseid,
+   lang.accept_charset,
+   lang.accept_language
+);
 
-strbuf_append_str(http_request, \r\n);
 PRInt32 written = PR_Send(tcp_sock, http_request-buf, http_request-len,
   /*flags:*/0, PR_INTERVAL_NO_TIMEOUT);
 if (written == -1)
@@ -446,9 +439,6 @@ static int create(bool delete_temp_archive,
   char **task_id,
   char **task_password)
 {
-struct language lang;
-get_language(lang);
-
 if (delay)
 {
 puts(_(Querying server settings));
@@ -659,22 +649,14 @@ static int create(bool delete_temp_archive,
Content-Type: application/x-xz-compressed-tar\r\n
Content-Length: %lld\r\n
Connection: close\r\n
-   X-Task-Type: %d\r\n,
-   cfg.url, (long long)file_stat.st_size, task_type);
-
-if (lang.encoding)
-strbuf_append_strf(http_request,
-   Accept-Charset: %s\r\n,
-   lang.encoding);
-if (lang.locale)
-{
-strbuf_append_strf(http_request,
-   Accept-Language: %s\r\n,
-   lang.locale);
-free(lang.locale);
-}
-
-strbuf_append_str(http_request, \r\n);
+   X-Task-Type: %d\r\n
+   %s
+   %s
+   \r\n,
+   cfg.url, (long long)file_stat.st_size, task_type,
+   lang.accept_charset,
+   lang.accept_language
+);
 
 PRInt32 written = PR_Send(tcp_sock, http_request-buf, http_request-len,
   /*flags:*/0, PR_INTERVAL_NO_TIMEOUT);
@@ -825,9 +807,6 @@ static void status(const char *task_id,
char **task_status,
char **status_message)
 {
-struct language lang;
-