add http status code defines

diff --git a/src/kds_s2000w_client.h b/src/kds_s2000w_client.h
index aefb1c5c0bdd5aaac15031e648c544f8f5a94d2f..b1b5cbc1d7109b2224dee97a25e0ece91c17fe40 100644 (file)
--- a/src/kds_s2000w_client.h
+++ b/src/kds_s2000w_client.h
@@ -4,6 +4,11 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#define HTTP_OK 200
+#define HTTP_NO_CONTENT 204
+#define HTTP_BAD_REQUEST 400
+#define HTTP_LOCKED 423
+
 typedef struct {
        char* data;
        size_t size;

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index ee0bf2e335ed4961a7d8057e5b45a4738564ca72..65a8311527aff227249eea5173f77ef20d803401 100644 (file)
--- a/src/kds_s2000w_handler.c
+++ b/src/kds_s2000w_handler.c
@@ -147,12 +147,12 @@ connection_state_t _kds_s2000w_handler_connect(handler_t* h)
                        break;
                }
 
-               if (resp->code == 200) {
+               if (resp->code == HTTP_OK) {
                        connection_state = OPENED;
                        break;
                }
 
-               if (resp->code == 423) {
+               if (resp->code == HTTP_LOCKED) {
                        connection_state = BUSY;
                        break;
                }
@@ -160,7 +160,7 @@ connection_state_t _kds_s2000w_handler_connect(handler_t* h)
                sleep(1);
        }
 
-       if (result != 0 || resp->code != 200) {
+       if (result != 0 || resp->code != HTTP_OK) {
                kds_s2000w_client_response_free(resp);
                resp = NULL;
                kds_s2000w_client_free();
@@ -326,7 +326,7 @@ void kds_s2000w_handler_recreate_session(handler_t* h)
        const char* json_string = json_object_to_json_string_ext(h->scanner_config, JSON_C_TO_STRING_PLAIN);
        resp = kds_s2000w_client_response_init();
        resp->size = sizeof(char) * strlen(json_string);
-       resp->code = 0;
+       resp->code = 0L;
        resp->data = malloc(sizeof(char) * resp->size);
        resp->data = memcpy(resp->data, json_string, resp->size);
        kds_s2000w_client_set_option(h->sessionid, resp);

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index 3e84a270879551bd6b3b97dd5872608198d258c8..633c61d1dae8ec7e92452cf6a7f93cb27278ddf8 100644 (file)
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -191,7 +191,7 @@ void _kds_s2000w_handler_opts_set_options(handler_t* h)
 
        response_t* resp = kds_s2000w_client_response_init();
        resp->size = sizeof(char) * strlen(json_string);
-       resp->code = 0;
+       resp->code = 0L;
        resp->data = realloc(resp->data, resp->size);
        resp->data = memcpy(resp->data, json_string, resp->size);
        kds_s2000w_client_set_option(h->sessionid, resp);

diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c
index 0f07e3b374381be59ced65a82ced1402140e82f3..6f12702ac68ecd6fa64b642a6034e32e841a2c2e 100644 (file)
--- a/tests/kds_s2000w_net_get_opt_tests.c
+++ b/tests/kds_s2000w_net_get_opt_tests.c
@@ -86,7 +86,7 @@ int _kds_s2000w_net_get_opt_setup(void** state)
        resp->size = 1503;
        resp->data = malloc(resp->size);
        memcpy(resp->data, responsedata, resp->size);
-       resp->code = 200;
+       resp->code = HTTP_OK;
        *state = resp;
        return 0;
 }
@@ -965,7 +965,7 @@ void sane_kds_s2000w_net_could_not_load_options_by_get(void** state)
 {
        handler_t* h = kds_s2000w_handler_init();
        response_t* resp = kds_s2000w_client_response_init();
-       resp->code = 400;
+       resp->code = HTTP_BAD_REQUEST;
 
        will_return(mock_response, resp);
        will_return(__wrap_kds_s2000w_client_get_option, 0);
@@ -985,7 +985,7 @@ void sane_kds_s2000w_net_could_not_load_options_by_set(void** state)
 {
        handler_t* h = kds_s2000w_handler_init();
        response_t* resp = kds_s2000w_client_response_init();
-       resp->code = 400;
+       resp->code = HTTP_BAD_REQUEST;
 
        will_return(mock_response, resp);
        will_return(__wrap_kds_s2000w_client_get_option, 0);

diff --git a/tests/kds_s2000w_net_set_opt_tests.c b/tests/kds_s2000w_net_set_opt_tests.c
index d98e3e4659b5ecb291bfadb499a732af091c147a..100cb939452f6b63ab9871e3ec263882f7e62841 100644 (file)
--- a/tests/kds_s2000w_net_set_opt_tests.c
+++ b/tests/kds_s2000w_net_set_opt_tests.c
@@ -84,10 +84,10 @@ int _kds_s2000w_net_set_opt_setup(void** state)
        resp->size = 1503;
        resp->data = malloc(resp->size);
        memcpy(resp->data, responsedata, resp->size);
-       resp->code = 200;
+       resp->code = HTTP_OK;
 
        response_t* set_opt_resp = kds_s2000w_client_response_init();
-       set_opt_resp->code = 200;
+       set_opt_resp->code = HTTP_OK;
 
        responses[0] = resp;
        responses[1] = set_opt_resp;
@@ -254,7 +254,7 @@ void kds_s2000w_net_set_option_reset_test(void** state)
        defauls_resp->data = malloc(sizeof(char) * 1206);
        memcpy(defauls_resp->data, json, 1206);
        defauls_resp->size = 1206;
-       defauls_resp->code = 200;
+       defauls_resp->code = HTTP_OK;
 
        *set_value = 1;
        response_t** responses = (response_t**) *state;

diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c
index a5b6d30823271eb036eb775fcbe171774385ca69..e8848152b437fc94d55ff349006b80553bc146a4 100644 (file)
--- a/tests/kds_s2000w_net_tests.c
+++ b/tests/kds_s2000w_net_tests.c
@@ -22,7 +22,7 @@ int _kds_s2000w_net_setup(void** state)
        if (response_list == NULL)
                return 1;
        response_list[0] = kds_s2000w_client_response_init();
-       response_list[0]->code = 200;
+       response_list[0]->code = HTTP_OK;
        response_list[1] = kds_s2000w_client_response_init();
        const char* metadata_json = "{\
                \"Metadata\": {\
@@ -35,9 +35,9 @@ int _kds_s2000w_net_setup(void** state)
        response_list[1]->size = 106;
        response_list[1]->data = malloc(response_list[1]->size);
        memcpy(response_list[1]->data, metadata_json, response_list[1]->size);
-       response_list[1]->code = 200;
+       response_list[1]->code = HTTP_OK;
        response_list[2] = kds_s2000w_client_response_init();
-       response_list[2]->code = 200;
+       response_list[2]->code = HTTP_OK;
        response_list[2]->size = 17;
        response_list[2]->data = malloc(sizeof(char) * 17);
        char* image_data = (char*) response_list[2]->data;
@@ -111,7 +111,7 @@ int _kds_s2000w_net_setup(void** state)
                } \
        }";
        response_list[3] = kds_s2000w_client_response_init();
-       response_list[3]->code = 200;
+       response_list[3]->code = HTTP_OK;
        response_list[3]->size = 1251;
        response_list[3]->data = malloc(sizeof(char) * response_list[3]->size);
        memcpy(response_list[3]->data, all_options, response_list[3]->size);
@@ -320,7 +320,7 @@ void sane_kds_s2000w_net_open_test(void** state)
        resp->size = 27;
        resp->data = malloc(resp->size);
        memcpy(resp->data, responsedata, resp->size);
-       resp->code = 200;
+       resp->code = HTTP_OK;
        will_return(mock_response, resp);
        will_return(__wrap_kds_s2000w_client_open_session, 0);
        expect_function_call(__wrap_kds_s2000w_client_open_session);
@@ -376,7 +376,7 @@ void sane_kds_s2000w_net_open_no_mem_test()
 void sane_kds_s2000w_net_open_busy_device_test()
 {
        response_t* resp = kds_s2000w_client_response_init();
-       resp->code = 423;
+       resp->code = HTTP_LOCKED;
        will_return(mock_response, resp);
        will_return(__wrap_kds_s2000w_client_open_session, 0);
        expect_function_call(__wrap_kds_s2000w_client_open_session);
@@ -407,7 +407,7 @@ void sane_kds_s2000w_net_open_invalid_test()
 void sane_kds_s2000w_net_open_not_connected_test()
 {
        response_t* resp = kds_s2000w_client_response_init();
-       resp->code = 0;
+       resp->code = 0L;
        will_return(mock_response, resp);
        will_return(__wrap_kds_s2000w_client_open_session, 1);
        expect_function_call(__wrap_kds_s2000w_client_open_session);
@@ -453,7 +453,7 @@ void sane_kds_s2000w_net_start_test(void** state)
        resp_status->size = 204;
        resp_status->data = malloc(resp_status->size);
        memcpy(resp_status->data, status, resp_status->size);
-       resp_status->code = 200;
+       resp_status->code = HTTP_OK;
        will_return(mock_response, resp_status);
        will_return(__wrap_kds_s2000w_client_status_session, 0);
        will_return(mock_response, response_list[2]);
@@ -498,7 +498,7 @@ void sane_kds_s2000w_net_start_one_page_per_flatscan_test(void** state)
        resp_status->size = 204;
        resp_status->data = malloc(resp_status->size);
        memcpy(resp_status->data, status, resp_status->size);
-       resp_status->code = 200;
+       resp_status->code = HTTP_OK;
        will_return(mock_response, resp_status);
        will_return(__wrap_kds_s2000w_client_status_session, 0);
        will_return(mock_response, response_list[2]);
@@ -543,7 +543,7 @@ void sane_kds_s2000w_net_start_one_page_per_feeder_test(void** state)
        resp_status->size = 209;
        resp_status->data = malloc(resp_status->size);
        memcpy(resp_status->data, status, resp_status->size);
-       resp_status->code = 200;
+       resp_status->code = HTTP_OK;
        will_return(mock_response, resp_status);
        will_return(__wrap_kds_s2000w_client_status_session, 0);
        will_return(mock_response, response_list[2]);
@@ -590,7 +590,7 @@ void sane_kds_s2000w_net_start_two_pages_per_feeder_test(void** state)
        resp_status->size = 209;
        resp_status->data = malloc(resp_status->size);
        memcpy(resp_status->data, status, resp_status->size);
-       resp_status->code = 200;
+       resp_status->code = HTTP_OK;
        will_return(mock_response, resp_status);
        will_return(__wrap_kds_s2000w_client_status_session, 0);
        will_return(mock_response, response_list[2]);
@@ -624,7 +624,7 @@ void sane_kds_s2000w_net_start_two_pages_per_feeder_test(void** state)
        resp_status->size = 209;
        resp_status->data = malloc(resp_status->size);
        memcpy(resp_status->data, status2, resp_status->size);
-       resp_status->code = 200;
+       resp_status->code = HTTP_OK;
        will_return(mock_response, resp_status);
        will_return(__wrap_kds_s2000w_client_status_session, 0);
        will_return(mock_response, response_list[2]);
@@ -664,11 +664,11 @@ void sane_kds_s2000w_net_cancel_test()
        resp_status->size = 204;
        resp_status->data = malloc(resp_status->size);
        memcpy(resp_status->data, status, resp_status->size);
-       resp_status->code = 200;
+       resp_status->code = HTTP_OK;
        will_return(mock_response, resp_status);
        will_return(__wrap_kds_s2000w_client_status_session, 0);
        response_t* resp = kds_s2000w_client_response_init();
-       resp->code = 200;
+       resp->code = HTTP_OK;
        resp->size = 0;
        will_return(__wrap_kds_s2000w_client_stop_scan, 0);
        expect_function_call(__wrap_kds_s2000w_client_status_session);
@@ -708,11 +708,11 @@ void sane_kds_s2000w_net_cancel_canceled_test()
        resp_status->size = 27;
        resp_status->data = malloc(resp_status->size);
        memcpy(resp_status->data, status, resp_status->size);
-       resp_status->code = 200;
+       resp_status->code = HTTP_OK;
        will_return(mock_response, resp_status);
        will_return(__wrap_kds_s2000w_client_open_session, 0);
        response_t* set_option = kds_s2000w_client_response_init();
-       set_option->code = 200;
+       set_option->code = HTTP_OK;
        set_option->size = 0;
        will_return(mock_response, set_option);
        will_return(__wrap_kds_s2000w_client_set_option, 0);
@@ -751,7 +751,7 @@ void sane_kds_s2000w_net_cancel_completed_scan_feeder_test()
        resp_status->size = 209;
        resp_status->data = malloc(resp_status->size);
        memcpy(resp_status->data, status, resp_status->size);
-       resp_status->code = 200;
+       resp_status->code = HTTP_OK;
        will_return(mock_response, resp_status);
        will_return(__wrap_kds_s2000w_client_status_session, 0);
        expect_function_call(__wrap_kds_s2000w_client_status_session);
@@ -775,7 +775,7 @@ void sane_kds_s2000w_net_cancel_failed_test()
 
        expect_function_call(__wrap_kds_s2000w_client_close_session);
        response_t* resp = kds_s2000w_client_response_init();
-       resp->code = 400;
+       resp->code = HTTP_BAD_REQUEST;
        will_return(mock_response, resp);
        will_return(__wrap_kds_s2000w_client_open_session, 0);
        expect_function_call(__wrap_kds_s2000w_client_open_session);
@@ -806,7 +806,7 @@ void sane_kds_s2000w_net_cancel_completed_scan_flatbed_test()
        resp_status->size = 204;
        resp_status->data = malloc(resp_status->size);
        memcpy(resp_status->data, status, resp_status->size);
-       resp_status->code = 200;
+       resp_status->code = HTTP_OK;
        will_return(mock_response, resp_status);
        will_return(__wrap_kds_s2000w_client_status_session, 0);
        response_t* resp_session = kds_s2000w_client_response_init();
@@ -814,11 +814,11 @@ void sane_kds_s2000w_net_cancel_completed_scan_flatbed_test()
        resp_session->size = 27;
        resp_session->data = malloc(resp_session->size);
        memcpy(resp_session->data, responsedata, resp_session->size);
-       resp_session->code = 200;
+       resp_session->code = HTTP_OK;
        will_return(mock_response, resp_session);
        will_return(__wrap_kds_s2000w_client_open_session, 0);
        response_t* resp_options = kds_s2000w_client_response_init();
-       resp_options->code = 200;
+       resp_options->code = HTTP_OK;
        resp_options->size = 0;
        will_return(mock_response, resp_options);
        will_return(__wrap_kds_s2000w_client_set_option, 0);