hmcfgusb: unify error-handling in interrupt

diff --git a/hmcfgusb.c b/hmcfgusb.c
index e3cde0f74a6897eb9009f19d23e3f25b292fcd1f..652eb429c013b9e70ee7283b4c175b50ab4dc4f1 100644 (file)
--- a/hmcfgusb.c
+++ b/hmcfgusb.c
@@ -262,15 +262,7 @@ static void LIBUSB_CALL hmcfgusb_interrupt(struct libusb_transfer *transfer)
                                fprintf(stderr, "Interrupt transfer not completed: %s!\n", usb_strerror(transfer->status));
 
                        quit = EIO;
                                fprintf(stderr, "Interrupt transfer not completed: %s!\n", usb_strerror(transfer->status));
 
                        quit = EIO;

-
-                       libusb_free_transfer(transfer);
-                       if (cb_data) {
-                               if (cb_data->dev && cb_data->dev->transfer) {
-                                       cb_data->dev->transfer = NULL;
-                               }
-                               free(cb_data);
-                       }
-                       return;
+                       goto out;

                }
        } else {
                if (cb_data && cb_data->cb) {
                }
        } else {
                if (cb_data && cb_data->cb) {


@@ -279,14 +271,7 @@ static void LIBUSB_CALL hmcfgusb_interrupt(struct libusb_transfer *transfer)
 
                        if (!cb_data->cb(transfer->buffer, transfer->actual_length, cb_data->data)) {
                                quit = EIO;
 
                        if (!cb_data->cb(transfer->buffer, transfer->actual_length, cb_data->data)) {
                                quit = EIO;

-
-                               libusb_free_transfer(transfer);
-                               if (cb_data && cb_data->dev && cb_data->dev->transfer) {
-                                       cb_data->dev->transfer = NULL;
-                                       free(cb_data);
-                               }
-
-                               return;
+                               goto out;

                        }
                } else {
                        hexdump(transfer->buffer, transfer->actual_length, "> ");
                        }
                } else {
                        hexdump(transfer->buffer, transfer->actual_length, "> ");


@@ -296,12 +281,18 @@ static void LIBUSB_CALL hmcfgusb_interrupt(struct libusb_transfer *transfer)
        err = libusb_submit_transfer(transfer);
        if (err != 0) {
                fprintf(stderr, "Can't re-submit transfer: %s\n", usb_strerror(err));
        err = libusb_submit_transfer(transfer);
        if (err != 0) {
                fprintf(stderr, "Can't re-submit transfer: %s\n", usb_strerror(err));

-               libusb_free_transfer(transfer);
-               if (cb_data) {
-                       if (cb_data->dev)
-                               cb_data->dev->transfer = NULL;
-                       free(cb_data);
+               goto out;
+       }
+
+       return;
+
+out:
+       libusb_free_transfer(transfer);
+       if (cb_data) {
+               if (cb_data->dev && cb_data->dev->transfer) {
+                       cb_data->dev->transfer = NULL;

                }
                }

+               free(cb_data);

        }
 }
 
        }
 }