move from support/1.0.27 to feature/1.0.27

1 files changed, 63 insertions, 63 deletions

diff --git a/backend/xerox_mfp-usb.c b/backend/xerox_mfp-usb.c
index b9b56d8..6ef1eea 100644
--- a/backend/xerox_mfp-usb.c
+++ b/backend/xerox_mfp-usb.c
@@ -22,90 +22,90 @@
 extern int sanei_debug_xerox_mfp;
 
 int
-usb_dev_request (struct device *dev,
-	     SANE_Byte *cmd, size_t cmdlen,
-	     SANE_Byte *resp, size_t *resplen)
+usb_dev_request(struct device *dev,
+                SANE_Byte *cmd, size_t cmdlen,
+                SANE_Byte *resp, size_t *resplen)
 {
-  SANE_Status status;
-  size_t len = cmdlen;
-
-  if (cmd && cmdlen) {
-    status = sanei_usb_write_bulk (dev->dn, cmd, &cmdlen);
-    if (status != SANE_STATUS_GOOD) {
-      DBG (1, "%s: sanei_usb_write_bulk: %s\n", __FUNCTION__,
-	   sane_strstatus (status));
-      return SANE_STATUS_IO_ERROR;
+    SANE_Status status;
+    size_t len = cmdlen;
+
+    if (cmd && cmdlen) {
+        status = sanei_usb_write_bulk(dev->dn, cmd, &cmdlen);
+        if (status != SANE_STATUS_GOOD) {
+            DBG(1, "%s: sanei_usb_write_bulk: %s\n", __func__,
+                sane_strstatus(status));
+            return SANE_STATUS_IO_ERROR;
+        }
+
+        if (cmdlen != len) {
+            DBG(1, "%s: sanei_usb_write_bulk: wanted %lu bytes, wrote %lu bytes\n",
+                __func__, (size_t)len, (size_t)cmdlen);
+            return SANE_STATUS_IO_ERROR;
+        }
     }
 
-    if (cmdlen != len) {
-      DBG (1, "%s: sanei_usb_write_bulk: wanted %lu bytes, wrote %lu bytes\n",
-	   __FUNCTION__, (size_t)len, (size_t)cmdlen);
-      return SANE_STATUS_IO_ERROR;
-    }
-  }
-
-  if (resp && resplen) {
-    status = sanei_usb_read_bulk (dev->dn, resp, resplen);
-    if (status != SANE_STATUS_GOOD) {
-      DBG (1, "%s: sanei_usb_read_bulk: %s\n", __FUNCTION__,
-	   sane_strstatus (status));
-      return SANE_STATUS_IO_ERROR;
+    if (resp && resplen) {
+        status = sanei_usb_read_bulk(dev->dn, resp, resplen);
+        if (status != SANE_STATUS_GOOD) {
+            DBG(1, "%s: sanei_usb_read_bulk: %s\n", __func__,
+                sane_strstatus(status));
+            return SANE_STATUS_IO_ERROR;
+        }
     }
-  }
 
-  return SANE_STATUS_GOOD;
+    return SANE_STATUS_GOOD;
 }
 
 
 SANE_Status
-usb_dev_open (struct device *dev)
+usb_dev_open(struct device *dev)
 {
-  SANE_Status status;
-
-  DBG (3, "%s: open %p\n", __FUNCTION__, (void *)dev);
-  status = sanei_usb_open (dev->sane.name, &dev->dn);
-  if (status != SANE_STATUS_GOOD) {
-      DBG (1, "%s: sanei_usb_open(%s): %s\n", __FUNCTION__,
-	   dev->sane.name, sane_strstatus (status));
-      dev->dn = -1;
-      return status;
+    SANE_Status status;
+
+    DBG(3, "%s: open %p\n", __func__, (void *)dev);
+    status = sanei_usb_open(dev->sane.name, &dev->dn);
+    if (status != SANE_STATUS_GOOD) {
+        DBG(1, "%s: sanei_usb_open(%s): %s\n", __func__,
+            dev->sane.name, sane_strstatus(status));
+        dev->dn = -1;
+        return status;
     }
-  sanei_usb_clear_halt (dev->dn);
-  return SANE_STATUS_GOOD;
+    sanei_usb_clear_halt(dev->dn);
+    return SANE_STATUS_GOOD;
 }
 
 void
-usb_dev_close (struct device *dev)
+usb_dev_close(struct device *dev)
 {
-  if (!dev)
-    return;
-  DBG (3, "%s: closing dev %p\n", __FUNCTION__, (void *)dev);
-
-  /* finish all operations */
-  if (dev->scanning) {
-    dev->cancel = 1;
-    /* flush READ_IMAGE data */
-    if (dev->reading)
-      sane_read(dev, NULL, 1, NULL);
-    /* send cancel if not sent before */
-    if (dev->state != SANE_STATUS_CANCELLED)
-      ret_cancel(dev, 0);
-  }
-
-  sanei_usb_clear_halt (dev->dn);	/* unstall for next users */
-  sanei_usb_close (dev->dn);
-  dev->dn = -1;
+    if (!dev)
+        return;
+    DBG(3, "%s: closing dev %p\n", __func__, (void *)dev);
+
+    /* finish all operations */
+    if (dev->scanning) {
+        dev->cancel = 1;
+        /* flush READ_IMAGE data */
+        if (dev->reading)
+            sane_read(dev, NULL, 1, NULL);
+        /* send cancel if not sent before */
+        if (dev->state != SANE_STATUS_CANCELLED)
+            ret_cancel(dev, 0);
+    }
+
+    sanei_usb_clear_halt(dev->dn);	/* unstall for next users */
+    sanei_usb_close(dev->dn);
+    dev->dn = -1;
 }
 
 
 /* SANE API ignores return code of this callback */
 SANE_Status
-usb_configure_device (const char *devname, SANE_Status (*attach) (const char *dev))
+usb_configure_device(const char *devname, SANE_Status(*attach)(const char *dev))
 {
-  sanei_usb_set_timeout (1000);
-  sanei_usb_attach_matching_devices (devname, attach);
-  sanei_usb_set_timeout (30000);
-  return SANE_STATUS_GOOD;
+    sanei_usb_set_timeout(1000);
+    sanei_usb_attach_matching_devices(devname, attach);
+    sanei_usb_set_timeout(30000);
+    return SANE_STATUS_GOOD;
 }