Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove unused variables in database.c #2954

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+0 −7
Open

Remove unused variables in database.c #2954

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions src/database.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,19 +393,16 @@ void db__message_dequeue_first(struct mosquitto *context, struct mosquitto_msg_d
int db__message_delete_outgoing(struct mosquitto *context, uint16_t mid, enum mosquitto_msg_state expect_state, int qos)
{
struct mosquitto_client_msg *tail, *tmp;
int msg_index = 0;

if(!context) return MOSQ_ERR_INVAL;

DL_FOREACH_SAFE(context->msgs_out.inflight, tail, tmp){
msg_index++;
if(tail->mid == mid){
if(tail->qos != qos){
return MOSQ_ERR_PROTOCOL;
}else if(qos == 2 && tail->state != expect_state){
return MOSQ_ERR_PROTOCOL;
}
msg_index--;
db__message_remove_from_inflight(&context->msgs_out, tail);
break;
}
Expand All @@ -416,7 +413,6 @@ int db__message_delete_outgoing(struct mosquitto *context, uint16_t mid, enum mo
break;
}

msg_index++;
tail->timestamp = db.now_s;
switch(tail->qos){
case 0:
Expand Down Expand Up @@ -986,14 +982,12 @@ int db__message_release_incoming(struct mosquitto *context, uint16_t mid)
int retain;
char *topic;
char *source_id;
int msg_index = 0;
bool deleted = false;
int rc;

if(!context) return MOSQ_ERR_INVAL;

DL_FOREACH_SAFE(context->msgs_in.inflight, tail, tmp){
msg_index++;
if(tail->mid == mid){
if(tail->store->qos != 2){
return MOSQ_ERR_PROTOCOL;
Expand Down Expand Up @@ -1026,7 +1020,6 @@ int db__message_release_incoming(struct mosquitto *context, uint16_t mid)
break;
}

msg_index++;
tail->timestamp = db.now_s;

if(tail->qos == 2){
Expand Down