FS-10690: [libblade] Fixed linux build

diff --git a/libs/libblade/Makefile.am b/libs/libblade/Makefile.am
index cd9e2e8976ae461cf9401782af17bf430ba29a13..56484ff912ecff1f4b172964ae764e7cbf759d6d 100644 (file)
--- a/libs/libblade/Makefile.am
+++ b/libs/libblade/Makefile.am
@@ -24,7 +24,7 @@ libblade_la_SOURCES     += src/blade_transportmgr.c src/blade_rpcmgr.c src/blade
 libblade_la_SOURCES     += src/blade_mastermgr.c src/blade_connectionmgr.c src/blade_sessionmgr.c src/blade_restmgr.c
 libblade_la_SOURCES    += src/blade_identity.c src/blade_rpc.c src/blade_connection.c src/blade_session.c
 libblade_la_SOURCES    += src/blade_protocol.c src/blade_subscription.c src/blade_channel.c
-libblade_la_SOURCES    += src/blade_transport.c src/blade_transport_wss.c
+libblade_la_SOURCES    += src/blade_transport.c src/blade_transport_wss.c src/blade_web.c
 
 libblade_la_CFLAGS     = $(AM_CFLAGS) $(AM_CPPFLAGS) $(PCRE_CFLAGS)
 libblade_la_LDFLAGS     = -version-info 0:1:0 -lncurses -lpthread -lm -lconfig -lcivetweb $(AM_LDFLAGS)
@@ -36,7 +36,7 @@ library_include_HEADERS += src/include/blade_transportmgr.h src/include/blade_rp
 library_include_HEADERS += src/include/blade_mastermgr.h src/include/blade_connectionmgr.h src/include/blade_sessionmgr.h src/include/blade_restmgr.h
 library_include_HEADERS += src/include/blade_identity.h src/include/blade_rpc.h src/include/blade_connection.h src/include/blade_session.h
 library_include_HEADERS += src/include/blade_protocol.h src/include/blade_subscription.h src/include/blade_channel.h
-library_include_HEADERS += src/include/blade_transport.h src/include/blade_transport_wss.h
+library_include_HEADERS += src/include/blade_transport.h src/include/blade_transport_wss.h src/include/blade_web.h
 library_include_HEADERS += src/include/unqlite.h test/tap.h
 
 BUILT_SOURCES=$(CIVETWEB_LIB) $(LIBKS)

diff --git a/libs/libblade/src/blade_web.c b/libs/libblade/src/blade_web.c
index 1bf98dbf70557ec10bf131487907c0d7e10588bf..526726a7b12c5d68ee1b69f319be253b284f8e4f 100644 (file)
--- a/libs/libblade/src/blade_web.c
+++ b/libs/libblade/src/blade_web.c
@@ -124,7 +124,7 @@ KS_DECLARE(ks_status_t) blade_webrequest_load(blade_webrequest_t **bwreqP, struc
        ks_status_t ret = KS_STATUS_SUCCESS;
        ks_pool_t *pool = NULL;
        blade_webrequest_t *bwreq = NULL;
-       struct mg_request_info *info = NULL;
+       const struct mg_request_info *info = NULL;
        char buf[1024];
        int bytes = 0;
 
@@ -182,7 +182,7 @@ KS_DECLARE(ks_status_t) blade_webrequest_load(blade_webrequest_t **bwreqP, struc
        }
 
        for (int index = 0; index < info->num_headers; ++index) {
-               struct mg_header *header = &info->http_headers[index];
+               const struct mg_header *header = &info->http_headers[index];
                ks_hash_insert(bwreq->headers, (void *)ks_pstrdup(pool, header->name), (void *)ks_pstrdup(pool, header->value));
        }
 
@@ -252,7 +252,7 @@ KS_DECLARE(ks_status_t) blade_webrequest_header_add(blade_webrequest_t *bwreq, c
        ks_assert(value);
 
        ks_hash_insert(bwreq->headers, (void *)ks_pstrdup(ks_pool_get(bwreq), header), (void *)ks_pstrdup(ks_pool_get(bwreq), value));
-       
+
        return KS_STATUS_SUCCESS;
 }
 
@@ -339,7 +339,7 @@ KS_DECLARE(ks_status_t) blade_webrequest_send(blade_webrequest_t *bwreq, ks_bool
                        // @todo make sure key and value are URL encoded
                        mg_url_encode(key, buf, sizeof(buf));
                        ks_sb_printf(pathAndQuery, "%c%s=", firstQuery ? '?' : '&', buf);
-                       
+
                        mg_url_encode(value, buf, sizeof(buf));
                        ks_sb_append(pathAndQuery, buf);
 
@@ -393,7 +393,7 @@ KS_DECLARE(ks_status_t) blade_webrequest_oauth2_token_by_credentials_send(ks_boo
        char *auth = NULL;
        char encoded[1024];
        ks_pool_t *pool = NULL;
-       char *tok = NULL;
+       const char *tok = NULL;
 
        ks_assert(host);
        ks_assert(path);
@@ -415,7 +415,7 @@ KS_DECLARE(ks_status_t) blade_webrequest_oauth2_token_by_credentials_send(ks_boo
        cJSON_Delete(json);
 
        if ((ret = blade_webrequest_send(bwreq, secure, host, port, &bwres)) != KS_STATUS_SUCCESS) goto done;
-       
+
        if ((ret = blade_webresponse_content_json_get(bwres, &json)) != KS_STATUS_SUCCESS) goto done;
 
        if ((tok = cJSON_GetObjectCstr(json, "access_token")) == NULL) {
@@ -443,7 +443,7 @@ KS_DECLARE(ks_status_t) blade_webrequest_oauth2_token_by_code_send(ks_bool_t sec
        char *auth = NULL;
        char encoded[1024];
        ks_pool_t *pool = NULL;
-       char *tok = NULL;
+       const char *tok = NULL;
 
        ks_assert(host);
        ks_assert(path);
@@ -502,7 +502,7 @@ KS_DECLARE(ks_status_t) blade_webresponse_create(blade_webresponse_t **bwresP, c
 
        bwres->status_code = ks_pstrdup(pool, status);
        bwres->status_message = ks_pstrdup(pool, mg_get_response_code_text(NULL, atoi(status)));
-       
+
        ks_hash_create(&bwres->headers, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_NOLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY | KS_HASH_FLAG_FREE_VALUE, pool);
        ks_assert(bwres->headers);
 
@@ -523,7 +523,7 @@ KS_DECLARE(ks_status_t) blade_webresponse_load(blade_webresponse_t **bwresP, str
        ks_status_t ret = KS_STATUS_SUCCESS;
        ks_pool_t *pool = NULL;
        blade_webresponse_t *bwres = NULL;
-       struct mg_request_info *info = NULL;
+       const struct mg_request_info *info = NULL;
        char buf[1024];
        int bytes = 0;
 
@@ -549,7 +549,7 @@ KS_DECLARE(ks_status_t) blade_webresponse_load(blade_webresponse_t **bwresP, str
        ks_pool_set_cleanup(bwres, NULL, blade_webresponse_cleanup);
 
        for (int index = 0; index < info->num_headers; ++index) {
-               struct mg_header *header = &info->http_headers[index];
+               const struct mg_header *header = &info->http_headers[index];
                ks_hash_insert(bwres->headers, (void *)ks_pstrdup(pool, header->name), (void *)ks_pstrdup(pool, header->value));
        }
 

diff --git a/libs/libblade/switchblade/switchblade.c b/libs/libblade/switchblade/switchblade.c
index 9df78d46b044ec0321b27cae7b58653af42d5f9d..6946ea95c40589ebfd5ed89772e9650a4e7604a8 100644 (file)
--- a/libs/libblade/switchblade/switchblade.c
+++ b/libs/libblade/switchblade/switchblade.c
@@ -143,7 +143,7 @@ int rest_service_test(blade_restmgr_t *brestmgr, struct mg_connection *conn, con
        blade_webresponse_t *response = NULL;
        cJSON *json = NULL;
        cJSON *json_captures = NULL;
-       const char *token = NULL;
+       //const char *token = NULL;
 
        blade_webrequest_load(&request, conn);