retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

FS-10167: Updating linux build

This commit is contained in:
Shane Bryldt 2017-08-03 21:31:28 -05:00
parent 53690120ac
commit d5b1c328eb
4 changed files with 16 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libs/libblade/src/blade_identity.c
View File

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

4
libs/libblade/src/blade_protocol.c
View File

@ -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) KS_DECLARE(ks_status_t) blade_protocol_destroy(blade_protocol_t **bpP)
{ {
blade_protocol_t *bp = NULL;
ks_assert(bpP); ks_assert(bpP);
ks_assert(*bpP); ks_assert(*bpP);
bp = *bpP;
ks_pool_free(bpP); ks_pool_free(bpP);
return KS_STATUS_SUCCESS; return KS_STATUS_SUCCESS;

8
libs/libblade/src/blade_rpc.c
View File

@ -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) 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);
ks_assert(*brpcreqP); ks_assert(*brpcreqP);
brpcreq = *brpcreqP;
ks_pool_free(brpcreqP); ks_pool_free(brpcreqP);
return KS_STATUS_SUCCESS; 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) 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);
ks_assert(*brpcresP); ks_assert(*brpcresP);
brpcres = *brpcresP;
ks_pool_free(brpcresP); ks_pool_free(brpcresP);
return KS_STATUS_SUCCESS; return KS_STATUS_SUCCESS;

16
libs/libblade/src/blade_subscription.c
View File

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