FS-10167: Updating linux build

diff --git a/libs/libblade/src/blade_identity.c b/libs/libblade/src/blade_identity.c
index a5cc4d90e7db5b1fad99d66f04b858635968064b..49254b90714bdfbe9d5d4af01ecff7ecc5dcc741 100644 (file)
--- a/libs/libblade/src/blade_identity.c
+++ b/libs/libblade/src/blade_identity.c
@@ -1,23 +1,23 @@
 /*
  * Copyright (c) 2017, Shane Bryldt
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
- * 
+ *
  * * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
- * 
+ *
  * * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * 
+ *
  * * Neither the name of the original author; nor the names of any contributors
  * may be used to endorse or promote products derived from this software
  * without specific prior written permission.
- * 
- * 
+ *
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -35,7 +35,7 @@
 
 struct blade_identity_s {
        const char *uri;
-       
+
        const char *components;
        const char *name;
        const char *domain;
@@ -81,13 +81,9 @@ KS_DECLARE(ks_status_t) blade_identity_create(blade_identity_t **biP, ks_pool_t
 
 KS_DECLARE(ks_status_t) blade_identity_destroy(blade_identity_t **biP)
 {
-       blade_identity_t *bi = NULL;
-       
        ks_assert(biP);
        ks_assert(*biP);
 
-       bi = *biP;
-
        ks_pool_free(biP);
 
        return KS_STATUS_SUCCESS;
@@ -98,12 +94,12 @@ KS_DECLARE(ks_status_t) blade_identity_parse(blade_identity_t *bi, const char *u
        char *tmp = NULL;
        char *tmp2 = NULL;
        ks_pool_t *pool = NULL;
-       
+
        ks_assert(bi);
        ks_assert(uri);
 
        ks_log(KS_LOG_DEBUG, "Parsing URI: %s\n", uri);
-       
+
        pool = ks_pool_get(bi);
 
        if (bi->uri) {
@@ -116,7 +112,7 @@ KS_DECLARE(ks_status_t) blade_identity_parse(blade_identity_t *bi, const char *u
        bi->name = tmp;
        if (!(tmp = strchr(tmp, '@'))) return KS_STATUS_FAIL;
        *tmp++ = '\0';
-               
+
        bi->domain = tmp2 = tmp;
        if ((tmp = strchr(tmp, '/'))) {
                *tmp++ = '\0';

diff --git a/libs/libblade/src/blade_protocol.c b/libs/libblade/src/blade_protocol.c
index 1e2367a4193dc120262b087b9250027b8269dd2d..836642be6e4904d491d2c657425d6c5dcbdfc074 100644 (file)
--- a/libs/libblade/src/blade_protocol.c
+++ b/libs/libblade/src/blade_protocol.c
@@ -90,13 +90,9 @@ KS_DECLARE(ks_status_t) blade_protocol_create(blade_protocol_t **bpP, ks_pool_t
 
 KS_DECLARE(ks_status_t) blade_protocol_destroy(blade_protocol_t **bpP)
 {
-       blade_protocol_t *bp = NULL;
-
        ks_assert(bpP);
        ks_assert(*bpP);
 
-       bp = *bpP;
-
        ks_pool_free(bpP);
 
        return KS_STATUS_SUCCESS;

diff --git a/libs/libblade/src/blade_rpc.c b/libs/libblade/src/blade_rpc.c
index ff15a2f8b477fdc9e758a258bd34df5103864cbb..51a525164562ddafd75cb79f05ea633a4a9db56a 100644 (file)
--- a/libs/libblade/src/blade_rpc.c
+++ b/libs/libblade/src/blade_rpc.c
@@ -225,13 +225,9 @@ KS_DECLARE(ks_status_t) blade_rpc_request_create(blade_rpc_request_t **brpcreqP,
 
 KS_DECLARE(ks_status_t) blade_rpc_request_destroy(blade_rpc_request_t **brpcreqP)
 {
-       blade_rpc_request_t *brpcreq = NULL;
-
        ks_assert(brpcreqP);
        ks_assert(*brpcreqP);
 
-       brpcreq = *brpcreqP;
-
        ks_pool_free(brpcreqP);
 
        return KS_STATUS_SUCCESS;
@@ -361,13 +357,9 @@ KS_DECLARE(ks_status_t) blade_rpc_response_create(blade_rpc_response_t **brpcres
 
 KS_DECLARE(ks_status_t) blade_rpc_response_destroy(blade_rpc_response_t **brpcresP)
 {
-       blade_rpc_response_t *brpcres = NULL;
-
        ks_assert(brpcresP);
        ks_assert(*brpcresP);
 
-       brpcres = *brpcresP;
-
        ks_pool_free(brpcresP);
 
        return KS_STATUS_SUCCESS;

diff --git a/libs/libblade/src/blade_subscription.c b/libs/libblade/src/blade_subscription.c
index 5e7ad41809881b53481277188dcc5faa316480ff..153551e7718d91853c8a031c4d6fee17203e59f4 100644 (file)
--- a/libs/libblade/src/blade_subscription.c
+++ b/libs/libblade/src/blade_subscription.c
@@ -1,23 +1,23 @@
 /*
  * Copyright (c) 2017, Shane Bryldt
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
- * 
+ *
  * * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
- * 
+ *
  * * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * 
+ *
  * * Neither the name of the original author; nor the names of any contributors
  * may be used to endorse or promote products derived from this software
  * without specific prior written permission.
- * 
- * 
+ *
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -91,13 +91,9 @@ KS_DECLARE(ks_status_t) blade_subscription_create(blade_subscription_t **bsubP,
 
 KS_DECLARE(ks_status_t) blade_subscription_destroy(blade_subscription_t **bsubP)
 {
-       blade_subscription_t *bsub = NULL;
-       
        ks_assert(bsubP);
        ks_assert(*bsubP);
 
-       bsub = *bsubP;
-
        ks_pool_free(bsubP);
 
        return KS_STATUS_SUCCESS;