change handler opt with stdint

diff --git a/src/kds_s2000w_handler.h b/src/kds_s2000w_handler.h
index b15d996b84b6d98f236b2341143658e54c0ab1a6..e8657d94aa78c1fa171adc8cd065fa15eded3c7a 100644 (file)
--- a/src/kds_s2000w_handler.h
+++ b/src/kds_s2000w_handler.h
@@ -58,8 +58,8 @@ void kds_s2000w_handler_open(const char* devicename, void** handle);
 void kds_s2000w_handler_close(handler* h);
 void kds_s2000w_handler_recreate_session(handler* h);
 
-void kds_s2000w_handler_opts_get_option(handler* handle, int option, void* value, int* info);
-void kds_s2000w_handler_opts_set_option(handler* handle, int option, void* value, int* info);
+void kds_s2000w_handler_opts_get_option(handler* handle, uint32_t option, void* value, int32_t* info);
+void kds_s2000w_handler_opts_set_option(handler* handle, uint32_t option, void* value, int32_t* info);
 
 void kds_s2000w_handler_start_scan(handler* h);
 void kds_s2000w_handler_stop_scan(handler* h);

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index 412d5f6910f2881108467954d773d84b37aa13f2..fa9d3b8e6ff7b112c007b1b7cd9bdcdbb4cf1af8 100644 (file)
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -15,7 +15,7 @@ void _kds_s2000w_handler_opts_write_string_value(json_object* value_object, void
 
 void _kds_s2000w_handler_opts_write_int_value(json_object* value_object, void* value)
 {
-       int* int_value_ptr = (int*) value;
+       int32_t* int_value_ptr = (int32_t*) value;
        *int_value_ptr = json_object_get_int(value_object);
 }
 
@@ -27,7 +27,7 @@ void _kds_s2000w_handler_opts_write_string_value_to_json(json_object* value_obje
 
 void _kds_s2000w_handler_opts_write_int_value_to_json(json_object* value_object, void* value)
 {
-       int* int_value_ptr = (int*) value;
+       int32_t* int_value_ptr = (int32_t*) value;
        json_object_set_int(value_object, *int_value_ptr);
 }
 
@@ -37,7 +37,7 @@ void _kds_s2000w_handler_opts_load_options(handler* h)
        h->current_scanner_config = NULL;
 
        response* resp = kds_s2000w_client_response_init();
-       int result = kds_s2000w_client_get_option(h->sessionid, resp);
+       uint8_t result = kds_s2000w_client_get_option(h->sessionid, resp);
 
        if (result != 0 || resp->code != 200) {
                kds_s2000w_debug_printf_int(ERROR, "load options response code", resp->code);
@@ -54,7 +54,7 @@ void _kds_s2000w_handler_opts_load_options(handler* h)
 
 void _kds_s2000w_handler_opts_set_autostart_on(handler* h)
 {
-       int auto_start_value = AUTOSTART_ON;
+       uint32_t auto_start_value = AUTOSTART_ON;
        json_object* config = json_object_object_get(h->current_scanner_config, "Configuration");
        json_object* value_object = json_object_object_get(config, "AutoStart");
        _kds_s2000w_handler_opts_write_int_value_to_json(value_object, &auto_start_value);
@@ -94,7 +94,7 @@ void _kds_s2000w_handler_opts_set_options(handler* h)
        resp = NULL;
 }
 
-void kds_s2000w_handler_opts_get_option(handler* h, int option, void* value, int* info)
+void kds_s2000w_handler_opts_get_option(handler* h, uint32_t option, void* value, int32_t* info)
 {
        json_object* config = NULL;
        json_object* value_object = NULL;
@@ -111,7 +111,7 @@ void kds_s2000w_handler_opts_get_option(handler* h, int option, void* value, int
        switch(option) {
                case 0:
                        config = json_object_object_get(h->current_scanner_config, "Configuration");
-                       int* int_value_ptr = (int*) value;
+                       int32_t* int_value_ptr = (int32_t*) value;
                        *int_value_ptr = json_object_object_length(config);
                        kds_s2000w_debug_printf_int(DEBUG, "option numbers", *int_value_ptr);
                        break;
@@ -202,7 +202,7 @@ void kds_s2000w_handler_opts_get_option(handler* h, int option, void* value, int
        }
 }
 
-void kds_s2000w_handler_opts_set_option(handler* h, int option, void* value, int* info)
+void kds_s2000w_handler_opts_set_option(handler* h, uint32_t option, void* value, int32_t* info)
 {
        if (h->read_info->scan_started)
                return;

diff --git a/src/kds_s2000w_handler_opts.h b/src/kds_s2000w_handler_opts.h
index d09889530d9466a08c5a71fe4f329143cec9171e..43efb2dd536acd85ae4dbaea691db5bad8319142 100644 (file)
--- a/src/kds_s2000w_handler_opts.h
+++ b/src/kds_s2000w_handler_opts.h
@@ -1,8 +1,9 @@
 #ifndef KDS_S2000W_HANDLER_OPTS_H
 #define KDS_S2000W_HANDLER_OPTS_H
+#include <stdint.h>
 #include "kds_s2000w_handler.h"
 
-void kds_s2000w_handler_opts_get_option(handler* h, int option, void* value, int* info);
-void kds_s2000w_handler_opts_set_option(handler* h, int option, void* value, int* info);
+void kds_s2000w_handler_opts_get_option(handler* h, uint32_t option, void* value, int32_t* info);
+void kds_s2000w_handler_opts_set_option(handler* h, uint32_t option, void* value, int32_t* info);
 
 #endif
\ No newline at end of file