commit 8cd4a43bde2289a1808283ab94347dfba6375eda
author Shai Barack <shayba@google.com> Thu Sep 10 15:12:57 2020 -0700
committer Shai Barack <shayba@google.com> Fri Sep 11 02:30:31 2020 +0000
tree 26152cb566e846ade0af05a240312e8934e0ded1
parent e29e7316470b9e30002d757b9e40d61c78784c71

[Wconversion] Suppress warnings

Bug: 58162
Change-Id: Ib04d6724e5efa93b2b782d78693370ed075aeae7
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/curl/+/425958
Reviewed-by: Roland McGrath <mcgrathr@google.com>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 5aeb395..aeaf8ed 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -30,9 +30,7 @@
   import("//build/package.gni")
 
   package("curl") {
-    deps = [
-      ":curl_bin",
-    ]
+    deps = [ ":curl_bin" ]
 
     binaries = [
       {
@@ -54,17 +52,11 @@
 copy("copy_curl_config") {
   visibility = [ ":*" ]
   if (is_fuchsia) {
-    sources = [
-      "lib/curl_config.h.fuchsia",
-    ]
+    sources = [ "lib/curl_config.h.fuchsia" ]
   } else {
-    sources = [
-      "lib/curl_config.h.host",
-    ]
+    sources = [ "lib/curl_config.h.host" ]
   }
-  outputs = [
-    "$target_gen_dir/curl_config.h",
-  ]
+  outputs = [ "$target_gen_dir/curl_config.h" ]
 }
 
 target(default_library_type, "libcurl") {
@@ -76,8 +68,8 @@
     "lib/amigaos.h",
     "lib/arpa_telnet.h",
     "lib/asyn-ares.c",
-    "lib/asyn.h",
     "lib/asyn-thread.c",
+    "lib/asyn.h",
     "lib/base64.c",
     "lib/conncache.c",
     "lib/conncache.h",
@@ -98,10 +90,10 @@
     "lib/curl_endian.h",
     "lib/curl_fnmatch.c",
     "lib/curl_fnmatch.h",
-    "lib/curl_gethostname.c",
-    "lib/curl_gethostname.h",
     "lib/curl_get_line.c",
     "lib/curl_get_line.h",
+    "lib/curl_gethostname.c",
+    "lib/curl_gethostname.h",
     "lib/curl_gssapi.c",
     "lib/curl_gssapi.h",
     "lib/curl_hmac.h",
@@ -164,19 +156,19 @@
     "lib/hostasyn.c",
     "lib/hostcheck.c",
     "lib/hostcheck.h",
-    "lib/hostip4.c",
-    "lib/hostip6.c",
     "lib/hostip.c",
     "lib/hostip.h",
+    "lib/hostip4.c",
+    "lib/hostip6.c",
     "lib/hostsyn.c",
+    "lib/http.c",
+    "lib/http.h",
     "lib/http2.c",
     "lib/http2.h",
-    "lib/http.c",
     "lib/http_chunks.c",
     "lib/http_chunks.h",
     "lib/http_digest.c",
     "lib/http_digest.h",
-    "lib/http.h",
     "lib/http_negotiate.c",
     "lib/http_negotiate.h",
     "lib/http_ntlm.c",
@@ -247,8 +239,8 @@
     "lib/smtp.h",
     "lib/sockaddr.h",
     "lib/socks.c",
-    "lib/socks_gssapi.c",
     "lib/socks.h",
+    "lib/socks_gssapi.c",
     "lib/socks_sspi.c",
     "lib/speedcheck.c",
     "lib/speedcheck.h",
@@ -274,10 +266,10 @@
     "lib/timeval.h",
     "lib/transfer.c",
     "lib/transfer.h",
-    "lib/urlapi.c",
     "lib/url.c",
-    "lib/urldata.h",
     "lib/url.h",
+    "lib/urlapi.c",
+    "lib/urldata.h",
     "lib/vauth/cleartext.c",
     "lib/vauth/cram.c",
     "lib/vauth/digest.c",
@@ -335,15 +327,18 @@
 
 config("suppress_warnings") {
   visibility = [ ":*" ]
-  cflags = [ "-Wno-string-plus-int" ]
+  cflags = [
+    "-Wno-string-plus-int",
+    "-Wno-conversion",
+  ]
 }
 
 executable("curl_bin") {
   output_name = "curl"
   sources = [
-    "lib/curl_setup.h",
     "lib/curl_ctype.c",
     "lib/curl_ctype.h",
+    "lib/curl_setup.h",
     "lib/nonblock.c",
     "lib/nonblock.h",
     "lib/strtoofft.c",
@@ -446,4 +441,5 @@
     defines += [ "_GNU_SOURCE" ]
   }
   include_dirs = [ "lib" ]
+  configs += [ ":suppress_warnings" ]
 }