--- motion-20051024-051001/netcam_ftp.c	2005-10-09 14:24:24.000000000 +0200
+++ motion-20051024-051001-netcam-enhanced/netcam_ftp.c	2005-10-24 12:11:16.000000000 +0200
@@ -405,7 +405,7 @@ int ftp_connect(netcam_context_ptr netca
 	if (connect(ctxt->control_file_desc, (struct sockaddr *) &ctxt->ftp_address,
 	addrlen) < 0) {
 		motion_log(LOG_ERR, 1, "Failed to create a connection");
-		close(ctxt->control_file_desc); ctxt->control_file_desc = -1;
+		close(ctxt->control_file_desc);
 		ctxt->control_file_desc = -1;
 		return(-1);
 	}
@@ -415,7 +415,7 @@ int ftp_connect(netcam_context_ptr netca
 	*/
 	res = ftp_get_response(ctxt);
 	if (res != 2) {
-		close(ctxt->control_file_desc); ctxt->control_file_desc = -1;
+		close(ctxt->control_file_desc);
 		ctxt->control_file_desc = -1;
 		return(-1);
 	}
@@ -425,7 +425,7 @@ int ftp_connect(netcam_context_ptr netca
 	*/
 	res = ftp_send_user(ctxt);
 	if (res < 0) {
-		close(ctxt->control_file_desc); ctxt->control_file_desc = -1;
+		close(ctxt->control_file_desc);
 		ctxt->control_file_desc = -1;
 		return(-1);
 	}
@@ -440,13 +440,13 @@ int ftp_connect(netcam_context_ptr netca
 		case 5:
 		case -1:
 		default:
-		close(ctxt->control_file_desc); ctxt->control_file_desc = -1;
+		close(ctxt->control_file_desc);
 		ctxt->control_file_desc = -1;
 		return(-1);
 	}
 	res = ftp_send_passwd(ctxt);
 	if (res < 0) {
-		close(ctxt->control_file_desc); ctxt->control_file_desc = -1;
+		close(ctxt->control_file_desc);
 		ctxt->control_file_desc = -1;
 		return(-1);
 	}
@@ -528,13 +528,15 @@ static int ftp_get_connection(ftp_contex
 		res = ftp_get_response(ctxt);
 		if (res != 2) {
 			if (res == 5) {
-				close(ctxt->data_file_desc); ctxt->data_file_desc = -1;
+				close(ctxt->data_file_desc);
+				ctxt->data_file_desc = -1;
 				return(-1);
 			} else {
 				/*
 				* retry with an active connection
 				*/
-				close(ctxt->data_file_desc); ctxt->data_file_desc = -1;
+				close(ctxt->data_file_desc);
+				ctxt->data_file_desc = -1;
 				ctxt->passive = 0;
 			}
 		}
@@ -546,7 +548,8 @@ static int ftp_get_connection(ftp_contex
 		&temp[3], &temp[4], &temp[5]) != 6) {
 			motion_log(LOG_ERR, 0, "Invalid answer to PASV");
 			if (ctxt->data_file_desc != -1) {
-				close (ctxt->data_file_desc); ctxt->data_file_desc = -1;
+				close (ctxt->data_file_desc);
+				ctxt->data_file_desc = -1;
 			}
 			return (-1);
 		}
@@ -559,7 +562,8 @@ static int ftp_get_connection(ftp_contex
 		if (connect(ctxt->data_file_desc, (struct sockaddr *) &data_address,
 		    data_address_length) < 0) {
 			motion_log(LOG_ERR, 1, "Failed to create a data connection");
-			close(ctxt->data_file_desc); ctxt->data_file_desc = -1;
+			close(ctxt->data_file_desc);
+			ctxt->data_file_desc = -1;
 			return (-1);
 		}
 	} else {
@@ -577,7 +581,8 @@ static int ftp_get_connection(ftp_contex
 		if (bind(ctxt->data_file_desc, (struct sockaddr *) &data_address,
 		    data_address_length) < 0) {
 			motion_log(LOG_ERR, 1, "bind failed");
-			close(ctxt->data_file_desc); ctxt->data_file_desc = -1;
+			close(ctxt->data_file_desc);
+			ctxt->data_file_desc = -1;
 			return (-1);
 		}
 
@@ -588,7 +593,8 @@ static int ftp_get_connection(ftp_contex
 		/* set up a 'listen' on the port to get the server's connection */
 		if (listen(ctxt->data_file_desc, 1) < 0) {
 			motion_log(LOG_ERR, 1, "listen failed");
-			close(ctxt->data_file_desc); ctxt->data_file_desc = -1;
+			close(ctxt->data_file_desc);
+			ctxt->data_file_desc = -1;
 			return (-1);
 		}
 
@@ -657,17 +663,20 @@ static int ftp_close_connection(ftp_cont
 	res = select(ctxt->control_file_desc + 1, &rfd, NULL, &efd, &tv);
 
 	if (res < 0) {
-		close(ctxt->control_file_desc); ctxt->control_file_desc = -1;
+		close(ctxt->control_file_desc);
+		ctxt->control_file_desc = -1;
 		return(-1);
 	}
 
 	if (res == 0) {             /* timeout */
-		close(ctxt->control_file_desc); ctxt->control_file_desc = -1;
+		close(ctxt->control_file_desc);
+		ctxt->control_file_desc = -1;
 	} else {                    /* read the response */
 		res = ftp_get_response(ctxt);
 
 		if (res != 2) {            /* should be positive completion (2) */
-			close(ctxt->control_file_desc); ctxt->control_file_desc = -1;
+			close(ctxt->control_file_desc);
+			ctxt->control_file_desc = -1;
 			return(-1);
 		}
 	}
@@ -721,7 +730,8 @@ int ftp_get_socket(ftp_context_pointer c
 	res = ftp_get_response(ctxt);
 
 	if (res != 1) {
-		close(ctxt->data_file_desc); ctxt->data_file_desc = -1;
+		close(ctxt->data_file_desc);
+		ctxt->data_file_desc = -1;
 		return(-res);
 	}
 
@@ -772,14 +782,16 @@ int ftp_send_type(ftp_context_pointer ct
 
 	if (res < 0) {
 		motion_log(LOG_ERR, 1, "send failed in ftp_get_socket");
-		close(ctxt->data_file_desc); ctxt->data_file_desc = -1;
+		close(ctxt->data_file_desc);
+		ctxt->data_file_desc = -1;
 		return(res);
 	}
 
 	res = ftp_get_response(ctxt);
 
 	if (res != 2) {
-		close(ctxt->data_file_desc); ctxt->data_file_desc = -1;
+		close(ctxt->data_file_desc);
+		ctxt->data_file_desc = -1;
 		return(-res);
 	}