diff options
| author | 2009-04-25 15:14:39 +0200 | |
|---|---|---|
| committer | 2009-04-25 15:14:39 +0200 | |
| commit | cae80628faeeb19a88a28d7fb058e74f8b2743ed (patch) | |
| tree | 99436d996ede094fa942019d9763eb22bcb69b03 | |
| parent | ce4b528e203a67cbc3c8c2950b237b8fd1a41bed (diff) | |
| download | usbmuxd-cae80628faeeb19a88a28d7fb058e74f8b2743ed.tar.gz usbmuxd-cae80628faeeb19a88a28d7fb058e74f8b2743ed.tar.bz2 | |
removed unused buffer variable from usbmux_device_t
| -rw-r--r-- | usbmux.c | 13 |
1 files changed, 6 insertions, 7 deletions
| @@ -56,7 +56,6 @@ typedef struct { | |||
| 56 | } receivebuf_t; | 56 | } receivebuf_t; |
| 57 | 57 | ||
| 58 | struct usbmux_device_int { | 58 | struct usbmux_device_int { |
| 59 | char *buffer; | ||
| 60 | struct usb_dev_handle *usbdev; | 59 | struct usb_dev_handle *usbdev; |
| 61 | struct usb_device *__device; | 60 | struct usb_device *__device; |
| 62 | receivebuf_t usbReceive; | 61 | receivebuf_t usbReceive; |
| @@ -312,7 +311,6 @@ int usbmux_get_specific_device(int bus_n, int dev_n, | |||
| 312 | // Initialize the struct | 311 | // Initialize the struct |
| 313 | newdevice->usbdev = NULL; | 312 | newdevice->usbdev = NULL; |
| 314 | newdevice->__device = NULL; | 313 | newdevice->__device = NULL; |
| 315 | newdevice->buffer = NULL; | ||
| 316 | 314 | ||
| 317 | // don't forget these: | 315 | // don't forget these: |
| 318 | newdevice->usbReceive.buffer = NULL; | 316 | newdevice->usbReceive.buffer = NULL; |
| @@ -422,9 +420,6 @@ int usbmux_free_device(usbmux_device_t device) | |||
| 422 | ret = bytes; | 420 | ret = bytes; |
| 423 | } | 421 | } |
| 424 | 422 | ||
| 425 | if (device->buffer) { | ||
| 426 | free(device->buffer); | ||
| 427 | } | ||
| 428 | if (device->usbReceive.buffer) { | 423 | if (device->usbReceive.buffer) { |
| 429 | free(device->usbReceive.buffer); | 424 | free(device->usbReceive.buffer); |
| 430 | } | 425 | } |
| @@ -624,10 +619,14 @@ static void delete_connection(usbmux_client_t connection) | |||
| 624 | 619 | ||
| 625 | // free up this connection | 620 | // free up this connection |
| 626 | pthread_mutex_lock(&connection->mutex); | 621 | pthread_mutex_lock(&connection->mutex); |
| 627 | if (connection->recv_buffer) | 622 | if (connection->recv_buffer) { |
| 628 | free(connection->recv_buffer); | 623 | free(connection->recv_buffer); |
| 629 | if (connection->header) | 624 | connection->recv_buffer = NULL; |
| 625 | } | ||
| 626 | if (connection->header) { | ||
| 630 | free(connection->header); | 627 | free(connection->header); |
| 628 | connection->header = NULL; | ||
| 629 | } | ||
| 631 | connection->r_len = 0; | 630 | connection->r_len = 0; |
| 632 | pthread_mutex_unlock(&connection->mutex); | 631 | pthread_mutex_unlock(&connection->mutex); |
| 633 | pthread_mutex_destroy(&connection->mutex); | 632 | pthread_mutex_destroy(&connection->mutex); |
