From 5372ee37d394b27f86ada8d9c50fc9b094c27675 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 30 Jun 2021 08:30:24 +0200
Subject: mqtt: extend the error message for no topic
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

... and mention that it needs URL encoding.

Reported-by: Peter Körner
Fixes #7316
Closes #7317
---
 lib/mqtt.c | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'lib/mqtt.c')

diff --git a/lib/mqtt.c b/lib/mqtt.c
index 9a3ca222f..81bf37864 100644
--- a/lib/mqtt.c
+++ b/lib/mqtt.c
@@ -378,22 +378,14 @@ fail:
 static CURLcode mqtt_get_topic(struct Curl_easy *data,
                                char **topic, size_t *topiclen)
 {
-  CURLcode result = CURLE_OK;
   char *path = data->state.up.path;
-
-  if(strlen(path) > 1) {
-    result = Curl_urldecode(data, path + 1, 0, topic, topiclen,
-                            REJECT_NADA);
-  }
-  else {
-    failf(data, "Error: No topic specified.");
-    result = CURLE_URL_MALFORMAT;
-  }
-  return result;
+  if(strlen(path) > 1)
+    return Curl_urldecode(data, path + 1, 0, topic, topiclen,
+                          REJECT_NADA);
+  failf(data, "No MQTT topic found. Forgot to URL encode it?");
+  return CURLE_URL_MALFORMAT;
 }
 
-
-
 static CURLcode mqtt_subscribe(struct Curl_easy *data)
 {
   CURLcode result = CURLE_OK;
-- 
cgit v1.2.1