From 05ec02b3f3f71ca5bd9d0cef718b5b29b2a96c01 Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Thu, 23 Jan 2020 10:55:49 +0000
Subject: [PATCH] Remove dead values.

---
 lib/helpers.c   | 12 +-----------
 lib/mosquitto.c |  1 -
 src/database.c  | 15 ++-------------
 src/subs.c      |  1 -
 4 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/lib/helpers.c b/lib/helpers.c
index 0f60501edc..eb5bdec9e1 100644
--- a/lib/helpers.c
+++ b/lib/helpers.c
@@ -27,7 +27,6 @@ struct userdata__callback {
 	int (*callback)(struct mosquitto *, void *, const struct mosquitto_message *);
 	void *userdata;
 	int qos;
-	int rc;
 };
 
 struct userdata__simple {
@@ -168,7 +167,6 @@ libmosq_EXPORT int mosquitto_subscribe_callback(
 
 	cb_userdata.topic = topic;
 	cb_userdata.qos = qos;
-	cb_userdata.rc = 0;
 	cb_userdata.userdata = userdata;
 	cb_userdata.callback = callback;
 
@@ -214,14 +212,6 @@ libmosq_EXPORT int mosquitto_subscribe_callback(
 	}
 	rc = mosquitto_loop_forever(mosq, -1, 1);
 	mosquitto_destroy(mosq);
-	if(cb_userdata.rc){
-		rc = cb_userdata.rc;
-	}
-	//if(!rc && cb_userdata.max_msg_count == 0){
-		//return MOSQ_ERR_SUCCESS;
-	//}else{
-		//return rc;
-	//}
-	return MOSQ_ERR_SUCCESS;
+	return rc;
 }
 
diff --git a/lib/mosquitto.c b/lib/mosquitto.c
index 795013eb13..39fcaa2913 100644
--- a/lib/mosquitto.c
+++ b/lib/mosquitto.c
@@ -567,7 +567,6 @@ int mosquitto_sub_topic_tokenise(const char *subtopic, char ***topics, int *coun
 	if(!(*topics)) return MOSQ_ERR_NOMEM;
 
 	start = 0;
-	stop = 0;
 	hier = 0;
 
 	for(i=0; i<len+1; i++){
diff --git a/src/database.c b/src/database.c
index 2f5a919ae7..4d9488b274 100644
--- a/src/database.c
+++ b/src/database.c
@@ -982,21 +982,9 @@ int db__message_write(struct mosquitto_db *db, struct mosquitto *context)
 				/* Message is expired, must not send. */
 				db__message_remove(db, &context->msgs_in, tail);
 				continue;
-			}else{
-				expiry_interval = tail->store->message_expiry_time - now;
 			}
-		}else{
-			expiry_interval = 0;
 		}
 		mid = tail->mid;
-		retries = tail->dup;
-		retain = tail->retain;
-		topic = tail->store->topic;
-		qos = tail->qos;
-		payloadlen = tail->store->payloadlen;
-		payload = UHPA_ACCESS_PAYLOAD(tail->store);
-		cmsg_props = tail->properties;
-		store_props = tail->store->properties;
 
 		switch(tail->state){
 			case mosq_ms_send_pubrec:
@@ -1033,7 +1021,6 @@ int db__message_write(struct mosquitto_db *db, struct mosquitto *context)
 
 	DL_FOREACH_SAFE(context->msgs_out.inflight, tail, tmp){
 		msg_count++;
-		expiry_interval = 0;
 		if(tail->store->message_expiry_time){
 			if(now == 0){
 				now = time(NULL);
@@ -1045,6 +1032,8 @@ int db__message_write(struct mosquitto_db *db, struct mosquitto *context)
 			}else{
 				expiry_interval = tail->store->message_expiry_time - now;
 			}
+		}else{
+			expiry_interval = 0;
 		}
 		mid = tail->mid;
 		retries = tail->dup;
diff --git a/src/subs.c b/src/subs.c
index cf71a1fb54..1abff30deb 100644
--- a/src/subs.c
+++ b/src/subs.c
@@ -241,7 +241,6 @@ static int sub__topic_tokenise(const char *subtopic, struct sub__token **topics)
 		start = 0;
 	}
 
-	stop = 0;
 	for(i=start; i<len+1; i++){
 		if(subtopic[i] == '/' || subtopic[i] == '\0'){
 			stop = i;