From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 7 Sep 2018 07:26:08 +0000 (+0200)
Subject: doh: minor edits to please Coverity
X-Git-Tag: curl-7_62_0~217
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c515294cec6ee9b72d68e6f13dc1972bcf3fed30;p=curl

doh: minor edits to please Coverity

The gcc typecheck macros and coverity combined made it warn on the 2nd
argument for ERROR_CHECK_SETOPT(). Here's minor rearrange to please it.

Coverity CID 1439115 and CID 1439114.
---

diff --git a/lib/doh.c b/lib/doh.c
index 33b3e06c9..70ffede35 100644
--- a/lib/doh.c
+++ b/lib/doh.c
@@ -218,11 +218,14 @@ static CURLcode dohprobe(struct Curl_easy *data,
   /* Curl_open() is the internal version of curl_easy_init() */
   result = Curl_open(&doh);
   if(!result) {
+    /* pass in the struct pointer via a local variable to please coverity and
+       the gcc typecheck helpers */
+    struct dohresponse *resp = &p->serverdoh;
     ERROR_CHECK_SETOPT(CURLOPT_URL, url);
     ERROR_CHECK_SETOPT(CURLOPT_WRITEFUNCTION, doh_write_cb);
-    ERROR_CHECK_SETOPT(CURLOPT_WRITEDATA, (void *)&p->serverdoh);
+    ERROR_CHECK_SETOPT(CURLOPT_WRITEDATA, resp);
     if(!data->set.doh_get) {
-      ERROR_CHECK_SETOPT(CURLOPT_POSTFIELDS, &p->dohbuffer[0]);
+      ERROR_CHECK_SETOPT(CURLOPT_POSTFIELDS, p->dohbuffer);
       ERROR_CHECK_SETOPT(CURLOPT_POSTFIELDSIZE, p->dohlen);
     }
     ERROR_CHECK_SETOPT(CURLOPT_HTTPHEADER, headers);