remove double code

diff --git a/src/kds_s2000w_client.c b/src/kds_s2000w_client.c
index 3fb9de35b4a53c124a9f0b92331b7f93cfc9cb49..6885761800a62e636bcfe0b5c991dfd53324bbdc 100644 (file)
--- a/src/kds_s2000w_client.c
+++ b/src/kds_s2000w_client.c
@@ -26,9 +26,8 @@ size_t _kds_s2000w_client_callback(char *ptr, size_t size, size_t nmemb, void *u
 response* kds_s2000w_client_response_init()
 {
        debug_printf(ALL, "kds_s2000w_client_response_init");
-       response* resp;
 
-       resp = malloc(sizeof(response));
+       response* resp = malloc(sizeof(response));
        resp->data = malloc(sizeof(char));
        resp->size = 0;
        resp->code = 0L;

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index ab4018ec1c4a98d8efe359f79c344e0d256d2b0b..e3912e587f407c1c674f59f430f907e886170405 100644 (file)
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -138,16 +138,6 @@ SANE_Status _sane_kds_s2000w_net_get_parameters(SANE_Handle handle,
        params->lines = h->current_metadata->lines;
        params->depth = h->current_metadata->depth;
 
-       if (!h->read_info->scan_started)
-               return SANE_STATUS_GOOD;
-
-       params->format = h->current_metadata->format;
-       params->last_frame = h->current_metadata->is_last;
-       params->bytes_per_line = h->current_metadata->bytes_per_line;
-       params->pixels_per_line = h->current_metadata->pixels_per_line;
-       params->lines = h->current_metadata->lines;
-       params->depth = h->current_metadata->depth;
-
        h->read_info->read_size = 0;
        h->read_info->readed_bytes_per_line = 0;
        h->read_info->readed_lines = 0;
@@ -194,9 +184,6 @@ SANE_Status _sane_kds_s2000w_net_read(SANE_Handle handle, SANE_Byte* data,
                h->read_info->scan_started = 0;
                *length = 0;
                kds_s2000w_handler_stop_scan(h);
-               sleep(1);
-               kds_s2000w_handler_close(h);
-               sleep(1);
                return SANE_STATUS_CANCELLED;
        }