Author: aconway
Date: Fri Jun 13 19:08:29 2014
New Revision: 1602496
URL: http://svn.apache.org/r1602496
Log:
NO-JIRA: Make all *_free functions be no-ops if passed NULL.
Modified:
qpid/dispatch/trunk/src/agent.c
qpid/dispatch/trunk/src/bitmask.c
qpid/dispatch/trunk/src/buffer.c
qpid/dispatch/trunk/src/compose.c
qpid/dispatch/trunk/src/connection_manager.c
qpid/dispatch/trunk/src/container.c
qpid/dispatch/trunk/src/dispatch.c
qpid/dispatch/trunk/src/hash.c
qpid/dispatch/trunk/src/iterator.c
qpid/dispatch/trunk/src/log.c
qpid/dispatch/trunk/src/message.c
qpid/dispatch/trunk/src/router_config.c
qpid/dispatch/trunk/src/router_node.c
qpid/dispatch/trunk/src/server.c
qpid/dispatch/trunk/src/timer.c
Modified: qpid/dispatch/trunk/src/agent.c
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/agent.c?rev=1602496&r1=1602495&r2=1602496&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/agent.c (original)
+++ qpid/dispatch/trunk/src/agent.c Fri Jun 13 19:08:29 2014
@@ -780,6 +780,7 @@ qd_agent_t *qd_agent(qd_dispatch_t *qd)
void qd_agent_free(qd_agent_t *agent)
{
+ if (!agent) return;
qd_agent_class_t *cls = DEQ_HEAD(agent->class_list);
while (cls) {
DEQ_REMOVE_HEAD(agent->class_list);
Modified: qpid/dispatch/trunk/src/bitmask.c
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/bitmask.c?rev=1602496&r1=1602495&r2=1602496&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/bitmask.c (original)
+++ qpid/dispatch/trunk/src/bitmask.c Fri Jun 13 19:08:29 2014
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -57,6 +57,7 @@ qd_bitmask_t *qd_bitmask(int initial)
void qd_bitmask_free(qd_bitmask_t *b)
{
+ if (!b) return;
free_qd_bitmask_t(b);
}
@@ -121,4 +122,3 @@ int qd_bitmask_first_set(qd_bitmask_t *b
*bitnum = b->first_set;
return 1;
}
-
Modified: qpid/dispatch/trunk/src/buffer.c
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/buffer.c?rev=1602496&r1=1602495&r2=1602496&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/buffer.c (original)
+++ qpid/dispatch/trunk/src/buffer.c Fri Jun 13 19:08:29 2014
@@ -47,6 +47,7 @@ qd_buffer_t *qd_buffer(void)
void qd_buffer_free(qd_buffer_t *buf)
{
+ if (!buf) return;
free_qd_buffer_t(buf);
}
@@ -80,4 +81,3 @@ void qd_buffer_insert(qd_buffer_t *buf,
buf->size += len;
assert(buf->size <= buffer_size);
}
-
Modified: qpid/dispatch/trunk/src/compose.c
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/compose.c?rev=1602496&r1=1602495&r2=1602496&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/compose.c (original)
+++ qpid/dispatch/trunk/src/compose.c Fri Jun 13 19:08:29 2014
@@ -209,6 +209,7 @@ qd_composed_field_t *qd_compose(uint64_t
void qd_compose_free(qd_composed_field_t *field)
{
+ if (!field) return;
qd_buffer_t *buf = DEQ_HEAD(field->buffers);
while (buf) {
DEQ_REMOVE_HEAD(field->buffers);
@@ -469,4 +470,3 @@ qd_buffer_list_t *qd_compose_buffers(qd_
{
return &field->buffers;
}
-
Modified: qpid/dispatch/trunk/src/connection_manager.c
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/connection_manager.c?rev=1602496&r1=1602495&r2=1602496&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/connection_manager.c (original)
+++ qpid/dispatch/trunk/src/connection_manager.c Fri Jun 13 19:08:29 2014
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -166,6 +166,7 @@ qd_connection_manager_t *qd_connection_m
static void qd_connection_manager_config_free(qd_server_config_t *cf)
{
+ if (!cf) return;
free(cf->host);
free(cf->port);
free(cf->role);
@@ -182,6 +183,7 @@ static void qd_connection_manager_config
void qd_connection_manager_free(qd_connection_manager_t *cm)
{
+ if (!cm) return;
qd_config_listener_t *cl = DEQ_HEAD(cm->config_listeners);
while (cl) {
DEQ_REMOVE_HEAD(cm->config_listeners);
@@ -401,4 +403,3 @@ const char *qd_config_connector_name(qd_
{
return cc ? cc->connector_name : 0;
}
-
Modified: qpid/dispatch/trunk/src/container.c
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/container.c?rev=1602496&r1=1602495&r2=1602496&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/container.c (original)
+++ qpid/dispatch/trunk/src/container.c Fri Jun 13 19:08:29 2014
@@ -441,6 +441,7 @@ void qd_container_setup_agent(qd_dispatc
void qd_container_free(qd_container_t *container)
{
+ if (!container) return;
if (container->default_node)
qd_container_destroy_node(container->default_node);
@@ -616,6 +617,7 @@ qd_link_t *qd_link(qd_node_t *node, qd_c
void qd_link_free(qd_link_t *link)
{
+ if (!link) return;
free_qd_link_t(link);
}
@@ -895,4 +897,3 @@ qd_link_t *qd_delivery_link(qd_delivery_
{
return delivery->link;
}
-
Modified: qpid/dispatch/trunk/src/dispatch.c
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/dispatch.c?rev=1602496&r1=1602495&r2=1602496&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/dispatch.c (original)
+++ qpid/dispatch/trunk/src/dispatch.c Fri Jun 13 19:08:29 2014
@@ -148,6 +148,7 @@ void qd_dispatch_prepare(qd_dispatch_t *
void qd_dispatch_free(qd_dispatch_t *qd)
{
+ if (!qd) return;
free(qd->router_id);
free(qd->router_area);
qd_config_free(qd->config);
Modified: qpid/dispatch/trunk/src/hash.c
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/hash.c?rev=1602496&r1=1602495&r2=1602496&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/hash.c (original)
+++ qpid/dispatch/trunk/src/hash.c Fri Jun 13 19:08:29 2014
@@ -101,6 +101,7 @@ qd_hash_t *qd_hash(int bucket_exponent,
void qd_hash_free(qd_hash_t *h)
{
+ if (!h) return;
qd_hash_item_t *item;
int idx;
@@ -295,4 +296,3 @@ qd_error_t qd_hash_remove_by_handle2(qd_
h->size--;
return QD_ERROR_NONE;
}
-
Modified: qpid/dispatch/trunk/src/iterator.c
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/iterator.c?rev=1602496&r1=1602495&r2=1602496&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/iterator.c (original)
+++ qpid/dispatch/trunk/src/iterator.c Fri Jun 13 19:08:29 2014
@@ -323,6 +323,7 @@ qd_field_iterator_t *qd_field_iterator_b
void qd_field_iterator_free(qd_field_iterator_t *iter)
{
+ if (!iter) return;
free_qd_field_iterator_t(iter);
}
@@ -548,5 +549,3 @@ qd_iovec_t *qd_field_iterator_iovec(cons
return iov;
}
-
-
Modified: qpid/dispatch/trunk/src/log.c
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/log.c?rev=1602496&r1=1602495&r2=1602496&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/log.c (original)
+++ qpid/dispatch/trunk/src/log.c Fri Jun 13 19:08:29 2014
@@ -55,7 +55,7 @@ ALLOC_DECLARE(qd_log_entry_t);
ALLOC_DEFINE(qd_log_entry_t);
DEQ_DECLARE(qd_log_entry_t, qd_log_list_t);
-static qd_log_list_t entries;
+static qd_log_list_t entries = {0};
static void qd_log_entry_free_lh(qd_log_entry_t* entry) {
DEQ_REMOVE(entries, entry);
@@ -74,7 +74,7 @@ typedef struct log_sink_t {
DEQ_DECLARE(log_sink_t, log_sink_list_t);
-static log_sink_list_t sink_list;
+static log_sink_list_t sink_list = {0};
static const char* SINK_STDERR = "stderr";
static const char* SINK_SYSLOG = "syslog";
@@ -142,7 +142,7 @@ DEQ_DECLARE(qd_log_source_t, qd_log_sour
static sys_mutex_t *log_lock = 0;
static sys_mutex_t *log_source_lock = 0;
-static qd_log_source_list_t source_list;
+static qd_log_source_list_t source_list = {0};
typedef enum {NONE, TRACE, DEBUG, INFO, NOTICE, WARNING, ERROR, CRITICAL,
N_LEVELS} level_index_t;
typedef struct level {
Modified: qpid/dispatch/trunk/src/message.c
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/message.c?rev=1602496&r1=1602495&r2=1602496&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/message.c (original)
+++ qpid/dispatch/trunk/src/message.c Fri Jun 13 19:08:29 2014
@@ -505,6 +505,7 @@ qd_message_t *qd_message()
void qd_message_free(qd_message_t *in_msg)
{
+ if (!in_msg) return;
uint32_t rc;
qd_message_pvt_t *msg = (qd_message_pvt_t*) in_msg;
qd_message_content_t *content = msg->content;
Modified: qpid/dispatch/trunk/src/router_config.c
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/router_config.c?rev=1602496&r1=1602495&r2=1602496&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/router_config.c (original)
+++ qpid/dispatch/trunk/src/router_config.c Fri Jun 13 19:08:29 2014
@@ -158,6 +158,8 @@ void qd_router_configure(qd_router_t *ro
void qd_router_configure_free(qd_router_t *router)
{
+ if (!router) return;
+
for (qd_config_address_t *ca = DEQ_HEAD(router->config_addrs); ca; ca =
DEQ_HEAD(router->config_addrs)) {
for (qd_config_phase_t *ap = DEQ_HEAD(ca->phases); ap; ap =
DEQ_HEAD(ca->phases)) {
DEQ_REMOVE_HEAD(ca->phases);
@@ -193,7 +195,7 @@ qd_address_semantics_t router_semantics_
}
if (addr) {
- *out_phase = in_phase == '\0' ? addr->last_phase : in_phase;
+ *out_phase = in_phase == '\0' ? addr->last_phase : in_phase;
phase = DEQ_HEAD(addr->phases);
while (phase) {
if (phase->phase == *out_phase)
@@ -204,5 +206,3 @@ qd_address_semantics_t router_semantics_
return phase ? phase->semantics : QD_SEMANTICS_DEFAULT;
}
-
-
Modified: qpid/dispatch/trunk/src/router_node.c
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/router_node.c?rev=1602496&r1=1602495&r2=1602496&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/router_node.c (original)
+++ qpid/dispatch/trunk/src/router_node.c Fri Jun 13 19:08:29 2014
@@ -671,7 +671,7 @@ static void router_forward_to_remote_sub
re->delivery = delivery;
qd_delivery_fifo_enter_LH(delivery);
}
-
+
addr->deliveries_transit++;
qd_link_activate(dest_link->link);
}
@@ -1486,6 +1486,8 @@ void qd_router_setup_late(qd_dispatch_t
void qd_router_free(qd_router_t *router)
{
+ if (!router) return;
+
qd_container_set_default_node_type(router->qd, 0, 0, QD_DIST_BOTH);
for (qd_address_t *addr = DEQ_HEAD(router->addrs); addr; addr =
DEQ_HEAD(router->addrs)) {
@@ -1666,4 +1668,3 @@ void qd_router_send2(qd_dispatch_t *qd,
qd_router_send(qd, iter, msg);
qd_field_iterator_free(iter);
}
-
Modified: qpid/dispatch/trunk/src/server.c
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/server.c?rev=1602496&r1=1602495&r2=1602496&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/server.c (original)
+++ qpid/dispatch/trunk/src/server.c Fri Jun 13 19:08:29 2014
@@ -682,6 +682,7 @@ qd_server_t *qd_server(int thread_count,
void qd_server_free(qd_server_t *qd_server)
{
+ if (!qd_server) return;
int i;
if (!qd_server)
return;
@@ -1023,6 +1024,7 @@ qd_user_fd_t *qd_user_fd(qd_dispatch_t *
void qd_user_fd_free(qd_user_fd_t *ufd)
{
+ if (!ufd) return;
pn_connector_close(ufd->pn_conn);
free_qd_user_fd_t(ufd);
}
@@ -1064,5 +1066,3 @@ void qd_server_timer_cancel_LH(qd_timer_
{
DEQ_REMOVE(timer->server->pending_timers, timer);
}
-
-
Modified: qpid/dispatch/trunk/src/timer.c
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/timer.c?rev=1602496&r1=1602495&r2=1602496&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/timer.c (original)
+++ qpid/dispatch/trunk/src/timer.c Fri Jun 13 19:08:29 2014
@@ -93,6 +93,7 @@ qd_timer_t *qd_timer(qd_dispatch_t *qd,
void qd_timer_free(qd_timer_t *timer)
{
+ if (!timer) return;
sys_mutex_lock(lock);
qd_timer_cancel_LH(timer);
DEQ_REMOVE(idle_timers, timer);
@@ -236,4 +237,3 @@ void qd_timer_idle_LH(qd_timer_t *timer)
timer->state = TIMER_IDLE;
DEQ_INSERT_TAIL(idle_timers, timer);
}
-
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
