Commit 6fcaf83c authored by Nick Mathewson's avatar Nick Mathewson 🏃
Browse files

Cleanup MOCK_IMPL (etc) to be findable with etags

A fair number of our mock_impl declarations were messed up so that
even our special AM_ETAGSFLAGS couldn't find them.

This should be a whitespace-only patch.
parent 5742e4fd
......@@ -1781,9 +1781,10 @@ free_interface_address6_list(smartlist_t *addrs)
* Returns NULL on failure.
* Use free_interface_address6_list to free the returned list.
*/
MOCK_IMPL(smartlist_t *,get_interface_address6_list,(int severity,
sa_family_t family,
int include_internal))
MOCK_IMPL(smartlist_t *,
get_interface_address6_list,(int severity,
sa_family_t family,
int include_internal))
{
smartlist_t *addrs;
tor_addr_t addr;
......
......@@ -2678,7 +2678,8 @@ static int uname_result_is_set = 0;
/** Return a pointer to a description of our platform.
*/
MOCK_IMPL(const char *, get_uname, (void))
MOCK_IMPL(const char *,
get_uname,(void))
{
#ifdef HAVE_UNAME
struct utsname u;
......
......@@ -479,7 +479,7 @@ crypto_pk_get_rsa_(crypto_pk_t *env)
* private is set, include the private-key portion of the key. Return a valid
* pointer on success, and NULL on failure. */
MOCK_IMPL(EVP_PKEY *,
crypto_pk_get_evp_pkey_,(crypto_pk_t *env, int private))
crypto_pk_get_evp_pkey_,(crypto_pk_t *env, int private))
{
RSA *key = NULL;
EVP_PKEY *pkey = NULL;
......@@ -516,7 +516,7 @@ crypto_dh_get_dh_(crypto_dh_t *dh)
* be set.
*/
MOCK_IMPL(crypto_pk_t *,
crypto_pk_new,(void))
crypto_pk_new,(void))
{
RSA *rsa;
......@@ -606,7 +606,7 @@ crypto_cipher_free(crypto_cipher_t *env)
* Return 0 on success, -1 on failure.
*/
MOCK_IMPL(int,
crypto_pk_generate_key_with_bits,(crypto_pk_t *env, int bits))
crypto_pk_generate_key_with_bits,(crypto_pk_t *env, int bits))
{
tor_assert(env);
......
......@@ -460,11 +460,11 @@ tor_x509_name_new(const char *cname)
* Return a certificate on success, NULL on failure.
*/
MOCK_IMPL(STATIC X509 *,
tor_tls_create_certificate,(crypto_pk_t *rsa,
crypto_pk_t *rsa_sign,
const char *cname,
const char *cname_sign,
unsigned int cert_lifetime))
tor_tls_create_certificate,(crypto_pk_t *rsa,
crypto_pk_t *rsa_sign,
const char *cname,
const char *cname_sign,
unsigned int cert_lifetime))
{
/* OpenSSL generates self-signed certificates with random 64-bit serial
* numbers, so let's do that too. */
......@@ -662,7 +662,7 @@ tor_x509_cert_free(tor_x509_cert_t *cert)
* Steals a reference to x509_cert.
*/
MOCK_IMPL(STATIC tor_x509_cert_t *,
tor_x509_cert_new,(X509 *x509_cert))
tor_x509_cert_new,(X509 *x509_cert))
{
tor_x509_cert_t *cert;
EVP_PKEY *pkey;
......
......@@ -359,8 +359,8 @@ channel_note_destroy_pending(channel_t *chan, circid_t id)
/** Called to indicate that a DESTROY is no longer pending on <b>chan</b> with
* circuit ID <b>id</b> -- typically, because it has been sent. */
MOCK_IMPL(void, channel_note_destroy_not_pending,
(channel_t *chan, circid_t id))
MOCK_IMPL(void,
channel_note_destroy_not_pending,(channel_t *chan, circid_t id))
{
circuit_t *circ = circuit_get_by_circid_channel_even_if_marked(id,chan);
if (circ) {
......
......@@ -6709,8 +6709,8 @@ control_event_bootstrap(bootstrap_status_t status, int progress)
* is the connection that caused this problem.
*/
MOCK_IMPL(void,
control_event_bootstrap_problem, (const char *warn, int reason,
or_connection_t *or_conn))
control_event_bootstrap_problem, (const char *warn, int reason,
or_connection_t *or_conn))
{
int status = bootstrap_percent;
const char *tag = "", *summary = "";
......
......@@ -565,7 +565,8 @@ dir_consensus_request_set_additional_headers(directory_request_t *req,
* Use <b>pds_flags</b> as arguments to router_pick_directory_server()
* or router_pick_trusteddirserver().
*/
MOCK_IMPL(void, directory_get_from_dirserver, (
MOCK_IMPL(void,
directory_get_from_dirserver,(
uint8_t dir_purpose,
uint8_t router_purpose,
const char *resource,
......
......@@ -2086,8 +2086,8 @@ assert_cache_ok_(void)
#endif
cached_resolve_t
*dns_get_cache_entry(cached_resolve_t *query)
cached_resolve_t *
dns_get_cache_entry(cached_resolve_t *query)
{
return HT_FIND(cache_map, &cache_root, query);
}
......
......@@ -426,8 +426,8 @@ list_sk_digests_for_authority_id, (const char *digest))
* download_status_t or NULL if none exists. */
MOCK_IMPL(download_status_t *,
download_status_for_authority_id_and_sk,
(const char *id_digest, const char *sk_digest))
download_status_for_authority_id_and_sk,(const char *id_digest,
const char *sk_digest))
{
download_status_t *dl = NULL;
cert_list_t *cl = NULL;
......@@ -4874,9 +4874,10 @@ list_pending_fpsk_downloads(fp_pair_map_t *result)
* range.) If <b>source</b> is given, download from <b>source</b>;
* otherwise, download from an appropriate random directory server.
*/
MOCK_IMPL(STATIC void, initiate_descriptor_downloads,
(const routerstatus_t *source, int purpose, smartlist_t *digests,
int lo, int hi, int pds_flags))
MOCK_IMPL(STATIC void,
initiate_descriptor_downloads,(const routerstatus_t *source,
int purpose, smartlist_t *digests,
int lo, int hi, int pds_flags))
{
char *resource, *cp;
int digest_len, enc_digest_len;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment