change client with stdint

diff --git a/src/kds_s2000w_client.c b/src/kds_s2000w_client.c
index 034ac1342b57197ed226e1e1c9d1913319cf8959..a2deebce0bcb874b31c17b5bf44cf59500d078bc 100644 (file)
--- a/src/kds_s2000w_client.c
+++ b/src/kds_s2000w_client.c
@@ -129,7 +129,7 @@ void kds_s2000w_client_response_free(response* resp)
        resp = NULL;
 }
 
-int kds_s2000w_client_open_session(response* resp)
+uint8_t kds_s2000w_client_open_session(response* resp)
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_client_open_session");
 
@@ -228,7 +228,7 @@ void kds_s2000w_client_close_session(int64_t sessionid)
        header_str = NULL;
 }
 
-int kds_s2000w_client_get_capabilities(response* resp)
+uint8_t kds_s2000w_client_get_capabilities(response* resp)
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_client_get_capabilities");
 
@@ -281,7 +281,7 @@ int kds_s2000w_client_get_capabilities(response* resp)
        return result;
 }
 
-int kds_s2000w_client_status_session(int64_t sessionid, response* resp)
+uint8_t kds_s2000w_client_status_session(int64_t sessionid, response* resp)
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_client_status_session");
 
@@ -343,7 +343,7 @@ int kds_s2000w_client_status_session(int64_t sessionid, response* resp)
        return result;
 }
 
-int kds_s2000w_client_start_scan(int64_t sessionid, response* resp)
+uint8_t kds_s2000w_client_start_scan(int64_t sessionid, response* resp)
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_client_start_scan");
 
@@ -403,7 +403,7 @@ int kds_s2000w_client_start_scan(int64_t sessionid, response* resp)
        return result;
 }
 
-int kds_s2000w_client_stop_scan(int64_t sessionid, response* resp)
+uint8_t kds_s2000w_client_stop_scan(int64_t sessionid, response* resp)
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_client_stop_scan");
 
@@ -463,7 +463,7 @@ int kds_s2000w_client_stop_scan(int64_t sessionid, response* resp)
        return result;
 }
 
-int kds_s2000w_client_get_image(int64_t sessionid, int img_number, response* resp)
+uint8_t kds_s2000w_client_get_image(int64_t sessionid, uint8_t img_number, response* resp)
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_client_get_image");
 
@@ -527,7 +527,7 @@ int kds_s2000w_client_get_image(int64_t sessionid, int img_number, response* res
        return result;
 }
 
-int kds_s2000w_client_delete_image(int64_t sessionid, int img_number, response* resp)
+uint8_t kds_s2000w_client_delete_image(int64_t sessionid, uint8_t img_number, response* resp)
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_client_delete_image");
 
@@ -591,7 +591,7 @@ int kds_s2000w_client_delete_image(int64_t sessionid, int img_number, response*
        return result;
 }
 
-int kds_s2000w_client_get_option(int64_t sessionid, response* resp)
+uint8_t kds_s2000w_client_get_option(int64_t sessionid, response* resp)
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_client_get_option");
 
@@ -650,7 +650,7 @@ int kds_s2000w_client_get_option(int64_t sessionid, response* resp)
        return result;
 }
 
-int kds_s2000w_client_set_option(int64_t sessionid, response* resp)
+uint8_t kds_s2000w_client_set_option(int64_t sessionid, response* resp)
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_client_set_option");
 

diff --git a/src/kds_s2000w_client.h b/src/kds_s2000w_client.h
index c981df50833ea2a711af2f4f0d53ef908a166611..31709a5b1961da23f56a68109a10e38d3e1c8910 100644 (file)
--- a/src/kds_s2000w_client.h
+++ b/src/kds_s2000w_client.h
@@ -6,7 +6,7 @@
 typedef struct {
        char* data;
        size_t size;
-       long code;
+       uint64_t code;
 } response;
 
 void kds_s2000w_client_init();
@@ -15,19 +15,19 @@ void kds_s2000w_client_free();
 response* kds_s2000w_client_response_init();
 void kds_s2000w_client_response_free(response* resp);
 
-int kds_s2000w_client_open_session(response* resp);
+uint8_t kds_s2000w_client_open_session(response* resp);
 void kds_s2000w_client_close_session(int64_t sessionid);
 
-int kds_s2000w_client_get_capabilities(response* resp);
-int kds_s2000w_client_status_session(int64_t sessionid, response* resp);
+uint8_t kds_s2000w_client_get_capabilities(response* resp);
+uint8_t kds_s2000w_client_status_session(int64_t sessionid, response* resp);
 
-int kds_s2000w_client_start_scan(int64_t sessionid, response* resp);
-int kds_s2000w_client_stop_scan(int64_t sessionid, response* resp);
+uint8_t kds_s2000w_client_start_scan(int64_t sessionid, response* resp);
+uint8_t kds_s2000w_client_stop_scan(int64_t sessionid, response* resp);
 
-int kds_s2000w_client_get_image(int64_t sessionid, int img_number, response* resp);
-int kds_s2000w_client_delete_image(int64_t sessionid, int img_number, response* resp);
+uint8_t kds_s2000w_client_get_image(int64_t sessionid, uint8_t img_number, response* resp);
+uint8_t kds_s2000w_client_delete_image(int64_t sessionid, uint8_t img_number, response* resp);
 
-int kds_s2000w_client_get_option(int64_t sessionid, response* resp);
-int kds_s2000w_client_set_option(int64_t sessionid, response* resp);
+uint8_t kds_s2000w_client_get_option(int64_t sessionid, response* resp);
+uint8_t kds_s2000w_client_set_option(int64_t sessionid, response* resp);
 
 #endif
\ No newline at end of file

diff --git a/tests/kds_s2000w_client_mock.c b/tests/kds_s2000w_client_mock.c
index 2d77285e304e033bf3c330dfe1b52a69325c6d71..5ea81aacfd499293b4b66ef987f21608123c85a3 100644 (file)
--- a/tests/kds_s2000w_client_mock.c
+++ b/tests/kds_s2000w_client_mock.c
@@ -27,7 +27,7 @@ void __wrap_kds_s2000w_client_free()
        return;
 }
 
-int __wrap_kds_s2000w_client_open_session(response* response)
+uint8_t __wrap_kds_s2000w_client_open_session(response* response)
 {
        function_called();
        mock_response(response);
@@ -40,49 +40,49 @@ void __wrap_kds_s2000w_client_close_session(int64_t sessionid)
        return;
 }
 
-int __wrap_kds_s2000w_client_start_scan(int64_t sessionid, response* response)
+uint8_t __wrap_kds_s2000w_client_start_scan(int64_t sessionid, response* response)
 {
        function_called();
        mock_response(response);
        return mock_type(int);
 }
 
-int __wrap_kds_s2000w_client_stop_scan(int64_t sessionid, response* response)
+uint8_t __wrap_kds_s2000w_client_stop_scan(int64_t sessionid, response* response)
 {
        function_called();
        mock_response(response);
        return mock_type(int);
 }
 
-int __wrap_kds_s2000w_client_status_session(int64_t sessionid, response* response)
+uint8_t __wrap_kds_s2000w_client_status_session(int64_t sessionid, response* response)
 {
        function_called();
        mock_response(response);
        return mock_type(int);
 }
 
-int __wrap_kds_s2000w_client_get_image(int64_t sessionid, int img_number, response* response)
+uint8_t __wrap_kds_s2000w_client_get_image(int64_t sessionid, uint8_t img_number, response* response)
 {
        function_called();
        mock_response(response);
        return mock_type(int);
 }
 
-int __wrap_kds_s2000w_client_delete_image(int64_t sessionid, int img_number, response* response)
+uint8_t __wrap_kds_s2000w_client_delete_image(int64_t sessionid, uint8_t img_number, response* response)
 {
        function_called();
        mock_response(response);
        return mock_type(int);
 }
 
-int __wrap_kds_s2000w_client_get_option(int64_t sessionid, response* response)
+uint8_t __wrap_kds_s2000w_client_get_option(int64_t sessionid, response* response)
 {
        function_called();
        mock_response(response);
        return mock_type(int);
 }
 
-int __wrap_kds_s2000w_client_set_option(int64_t sessionid, response* response)
+uint8_t __wrap_kds_s2000w_client_set_option(int64_t sessionid, response* response)
 {
        function_called();
        mock_response(response);

diff --git a/tests/kds_s2000w_client_mock.h b/tests/kds_s2000w_client_mock.h
index e328b666d18e845434cd445c82c60aea391b2d54..ec63ea2e61c79d3293cd169da99dee845d12b223 100644 (file)
--- a/tests/kds_s2000w_client_mock.h
+++ b/tests/kds_s2000w_client_mock.h
@@ -13,18 +13,18 @@ void mock_response(response* resp);
 void __wrap_kds_s2000w_client_init();
 void __wrap_kds_s2000w_client_free();
 
-int __wrap_kds_s2000w_client_open_session(response* response);
+uint8_t __wrap_kds_s2000w_client_open_session(response* response);
 void __wrap_kds_s2000w_client_close_session(int64_t sessionid);
 
-int __wrap_kds_s2000w_client_start_scan(int64_t sessionid, response* response);
-int __wrap_kds_s2000w_client_stop_scan(int64_t sessionid, response* response);
+uint8_t __wrap_kds_s2000w_client_start_scan(int64_t sessionid, response* response);
+uint8_t __wrap_kds_s2000w_client_stop_scan(int64_t sessionid, response* response);
 
-int __wrap_kds_s2000w_client_status_session(int64_t sessionid, response* response);
-int __wrap_kds_s2000w_client_get_image(int64_t sessionid, int img_number, response* response);
-int __wrap_kds_s2000w_client_delete_image(int64_t sessionid, int img_number, response* response);
+uint8_t __wrap_kds_s2000w_client_status_session(int64_t sessionid, response* response);
+uint8_t __wrap_kds_s2000w_client_get_image(int64_t sessionid, uint8_t img_number, response* response);
+uint8_t __wrap_kds_s2000w_client_delete_image(int64_t sessionid, uint8_t img_number, response* response);
 
-int __wrap_kds_s2000w_client_get_option(int64_t sessionid, response* response);
-int __wrap_kds_s2000w_client_set_option(int64_t sessionid, response* response);
+uint8_t __wrap_kds_s2000w_client_get_option(int64_t sessionid, response* response);
+uint8_t __wrap_kds_s2000w_client_set_option(int64_t sessionid, response* response);
 
 void __wrap_kds_s2000w_convert_jpg_to_pnm_with_depth(blobdata* in, blobdata* out);
 void __wrap_kds_s2000w_convert_tiff_to_pnm(blobdata* in, blobdata* out);