aboutsummaryrefslogtreecommitdiff
path: root/libssh/sftp.c
diff options
context:
space:
mode:
authorAndreas Schneider <mail@cynapses.org>2009-04-23 06:57:49 +0000
committerAndreas Schneider <mail@cynapses.org>2009-04-23 06:57:49 +0000
commit4816afc9e891a99b9684c4eab448c3e350d086bf (patch)
treecd1cf355806b1bd2f36913389dd7a9d4344712bf /libssh/sftp.c
parent5be3a3c0663382cac06d47534068be48c21515e2 (diff)
downloadlibssh-4816afc9e891a99b9684c4eab448c3e350d086bf.tar.gz
libssh-4816afc9e891a99b9684c4eab448c3e350d086bf.tar.xz
libssh-4816afc9e891a99b9684c4eab448c3e350d086bf.zip
Reformat sftp_dequeue().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@583 7dcaeef0-15fb-0310-b436-a5af3365683c
Diffstat (limited to 'libssh/sftp.c')
-rw-r--r--libssh/sftp.c59
1 files changed, 33 insertions, 26 deletions
diff --git a/libssh/sftp.c b/libssh/sftp.c
index 2251c13a..4dd3165b 100644
--- a/libssh/sftp.c
+++ b/libssh/sftp.c
@@ -533,34 +533,41 @@ static int sftp_enqueue(SFTP_SESSION *sftp, SFTP_MESSAGE *msg) {
return 0;
}
-/* pulls of a message from the queue based on the ID. returns null if no message has been found */
+/*
+ * Pulls of a message from the queue based on the ID.
+ * Returns NULL if no message has been found.
+ */
static SFTP_MESSAGE *sftp_dequeue(SFTP_SESSION *sftp, u32 id){
- REQUEST_QUEUE *queue,*prev=NULL;
- SFTP_MESSAGE *msg;
- if(sftp->queue==NULL){
- return NULL;
- }
- queue=sftp->queue;
- while(queue){
- if(queue->message->id==id){
- /* remove from queue */
- if(prev==NULL){
- sftp->queue=queue->next;
- } else {
- prev->next=queue->next;
- }
- msg=queue->message;
- request_queue_free(queue);
- ssh_log(sftp->session, SSH_LOG_PACKET,
- "Dequeued msg id %d type %d",
- msg->id,
- msg->packet_type);
- return msg;
- }
- prev=queue;
- queue=queue->next;
- }
+ REQUEST_QUEUE *prev = NULL;
+ REQUEST_QUEUE *queue;
+ SFTP_MESSAGE *msg;
+
+ if(sftp->queue == NULL) {
return NULL;
+ }
+
+ queue = sftp->queue;
+ while (queue) {
+ if(queue->message->id == id) {
+ /* remove from queue */
+ if (prev == NULL) {
+ sftp->queue = queue->next;
+ } else {
+ prev->next = queue->next;
+ }
+ msg = queue->message;
+ request_queue_free(queue);
+ ssh_log(sftp->session, SSH_LOG_PACKET,
+ "Dequeued msg id %d type %d",
+ msg->id,
+ msg->packet_type);
+ return msg;
+ }
+ prev = queue;
+ queue = queue->next;
+ }
+
+ return NULL;
}
/*