summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Nikias Bassen2010-01-13 01:29:18 +0100
committerGravatar Martin Szulecki2010-01-13 01:33:23 +0100
commit5c19d486959454560515666b0d250c20d9938d00 (patch)
treeeae7b93c0db7633544629ccd235be522bd828c7a
parent09deb301542d5db0b5371c3ccd2aed41ad98ef1c (diff)
downloadlibimobiledevice-5c19d486959454560515666b0d250c20d9938d00.tar.gz
libimobiledevice-5c19d486959454560515666b0d250c20d9938d00.tar.bz2
iphone: rename dst_port to port for consistency
-rw-r--r--include/libiphone/libiphone.h2
-rw-r--r--src/iphone.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/include/libiphone/libiphone.h b/include/libiphone/libiphone.h
index b07bd5d..b67fcd4 100644
--- a/include/libiphone/libiphone.h
+++ b/include/libiphone/libiphone.h
@@ -82,7 +82,7 @@ iphone_error_t iphone_device_new(iphone_device_t *device, const char *uuid);
82iphone_error_t iphone_device_free(iphone_device_t device); 82iphone_error_t iphone_device_free(iphone_device_t device);
83 83
84/* connection/disconnection and communication */ 84/* connection/disconnection and communication */
85iphone_error_t iphone_device_connect(iphone_device_t device, uint16_t dst_port, iphone_connection_t *connection); 85iphone_error_t iphone_device_connect(iphone_device_t device, uint16_t port, iphone_connection_t *connection);
86iphone_error_t iphone_device_disconnect(iphone_connection_t connection); 86iphone_error_t iphone_device_disconnect(iphone_connection_t connection);
87iphone_error_t iphone_device_send(iphone_connection_t connection, const char *data, uint32_t len, uint32_t *sent_bytes); 87iphone_error_t iphone_device_send(iphone_connection_t connection, const char *data, uint32_t len, uint32_t *sent_bytes);
88iphone_error_t iphone_device_recv_timeout(iphone_connection_t connection, char *data, uint32_t len, uint32_t *recv_bytes, unsigned int timeout); 88iphone_error_t iphone_device_recv_timeout(iphone_connection_t connection, char *data, uint32_t len, uint32_t *recv_bytes, unsigned int timeout);
diff --git a/src/iphone.c b/src/iphone.c
index b677220..6d95c45 100644
--- a/src/iphone.c
+++ b/src/iphone.c
@@ -202,20 +202,20 @@ iphone_error_t iphone_device_free(iphone_device_t device)
202 * Set up a connection to the given device. 202 * Set up a connection to the given device.
203 * 203 *
204 * @param device The device to connect to. 204 * @param device The device to connect to.
205 * @param dst_port The destination port to connect to. 205 * @param port The destination port to connect to.
206 * @param connection Pointer to an iphone_connection_t that will be filled 206 * @param connection Pointer to an iphone_connection_t that will be filled
207 * with the necessary data of the connection. 207 * with the necessary data of the connection.
208 * 208 *
209 * @return IPHONE_E_SUCCESS if ok, otherwise an error code. 209 * @return IPHONE_E_SUCCESS if ok, otherwise an error code.
210 */ 210 */
211iphone_error_t iphone_device_connect(iphone_device_t device, uint16_t dst_port, iphone_connection_t *connection) 211iphone_error_t iphone_device_connect(iphone_device_t device, uint16_t port, iphone_connection_t *connection)
212{ 212{
213 if (!device) { 213 if (!device) {
214 return IPHONE_E_INVALID_ARG; 214 return IPHONE_E_INVALID_ARG;
215 } 215 }
216 216
217 if (device->conn_type == CONNECTION_USBMUXD) { 217 if (device->conn_type == CONNECTION_USBMUXD) {
218 int sfd = usbmuxd_connect((uint32_t)(device->conn_data), dst_port); 218 int sfd = usbmuxd_connect((uint32_t)(device->conn_data), port);
219 if (sfd < 0) { 219 if (sfd < 0) {
220 debug_info("ERROR: Connecting to usbmuxd failed: %d (%s)", sfd, strerror(-sfd)); 220 debug_info("ERROR: Connecting to usbmuxd failed: %d (%s)", sfd, strerror(-sfd));
221 return IPHONE_E_UNKNOWN_ERROR; 221 return IPHONE_E_UNKNOWN_ERROR;