[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/maint-0.2.8] remove some more unused code
commit c98fbd4169d70033c5058994cab5cfbd24cf4e78
Author: Roger Dingledine <arma@xxxxxxxxxxxxxx>
Date: Thu Apr 14 02:18:25 2016 -0400
remove some more unused code
---
src/or/connection.c | 45 ---------------------------------------------
src/or/connection.h | 7 -------
2 files changed, 52 deletions(-)
diff --git a/src/or/connection.c b/src/or/connection.c
index 118e239..4fbbaf1 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -4438,32 +4438,6 @@ connection_get_by_type_state_rendquery(int type, int state,
));
}
-#define CONN_FIRST_AND_FREE_TEMPLATE(sl) \
- STMT_BEGIN \
- if (smartlist_len(sl) > 0) { \
- void *first_item = smartlist_get(sl, 0); \
- smartlist_free(sl); \
- return first_item; \
- } else { \
- smartlist_free(sl); \
- return NULL; \
- } \
- STMT_END
-
-/** Return a directory connection (if any one exists) that is fetching
- * the item described by <b>purpose</b>/<b>resource</b>, otherwise return NULL.
- */
-dir_connection_t *
-connection_dir_get_by_purpose_and_resource(
- int purpose,
- const char *resource)
-{
- smartlist_t *conns = connection_dir_list_by_purpose_and_resource(
- purpose,
- resource);
- CONN_FIRST_AND_FREE_TEMPLATE(conns);
-}
-
/** Return a new smartlist of dir_connection_t * from get_connection_array()
* that satisfy conn_test on connection_t *conn_var, and dirconn_test on
* dir_connection_t *dirconn_var. conn_var must be of CONN_TYPE_DIR and not
@@ -4504,25 +4478,6 @@ connection_dir_list_by_purpose_and_resource(
dirconn->requested_resource));
}
-/** Return a directory connection (if any one exists) that is fetching
- * the item described by <b>purpose</b>/<b>resource</b>/<b>state</b>,
- * otherwise return NULL. */
-dir_connection_t *
-connection_dir_get_by_purpose_resource_and_state(
- int purpose,
- const char *resource,
- int state)
-{
- smartlist_t *conns =
- connection_dir_list_by_purpose_resource_and_state(
- purpose,
- resource,
- state);
- CONN_FIRST_AND_FREE_TEMPLATE(conns);
-}
-
-#undef CONN_FIRST_AND_FREE_TEMPLATE
-
/** Return a list of directory connections that are fetching the item
* described by <b>purpose</b>/<b>resource</b>/<b>state</b>. If there are
* none, return an empty list. This list must be freed using smartlist_free,
diff --git a/src/or/connection.h b/src/or/connection.h
index 45175cd..4835235 100644
--- a/src/or/connection.h
+++ b/src/or/connection.h
@@ -192,13 +192,6 @@ MOCK_DECL(connection_t *,connection_get_by_type_addr_port_purpose,(int type,
connection_t *connection_get_by_type_state(int type, int state);
connection_t *connection_get_by_type_state_rendquery(int type, int state,
const char *rendquery);
-dir_connection_t *connection_dir_get_by_purpose_and_resource(
- int purpose,
- const char *resource);
-dir_connection_t *connection_dir_get_by_purpose_resource_and_state(
- int purpose,
- const char *resource,
- int state);
smartlist_t *connection_dir_list_by_purpose_and_resource(
int purpose,
const char *resource);
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits