summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-10-18 02:40:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-10-18 02:40:49 (GMT)
commitd0258d09448bff3da88b9b43636de1d8310ec436 (patch)
tree0a344228991eb0bd118c43890fcf496f5be7cb16
parentbb52def6dafabbfa07ee51562c9291222df55bd9 (diff)
parent5cc6a4be11644f3d302eee2e735261ace4cd1c4c (diff)
downloadgit-d0258d09448bff3da88b9b43636de1d8310ec436.zip
git-d0258d09448bff3da88b9b43636de1d8310ec436.tar.gz
git-d0258d09448bff3da88b9b43636de1d8310ec436.tar.bz2
Merge branch 'rs/http-push-simplify'
Code cleanup. * rs/http-push-simplify: http-push: simplify deleting a list item
-rw-r--r--http-push.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/http-push.c b/http-push.c
index 0353f9f..822f326 100644
--- a/http-push.c
+++ b/http-push.c
@@ -501,10 +501,10 @@ static void release_request(struct transfer_request *request)
if (request == request_queue_head) {
request_queue_head = request->next;
} else {
- while (entry->next != NULL && entry->next != request)
+ while (entry && entry->next != request)
entry = entry->next;
- if (entry->next == request)
- entry->next = entry->next->next;
+ if (entry)
+ entry->next = request->next;
}
free(request->url);
@@ -981,7 +981,7 @@ static int unlock_remote(struct remote_lock *lock)
while (prev && prev->next != lock)
prev = prev->next;
if (prev)
- prev->next = prev->next->next;
+ prev->next = lock->next;
}
free(lock->owner);