[tor-commits] [tor/master] Do not treat "DOCDOC" as doxygen.
nickm at torproject.org
nickm at torproject.org
Sat Mar 26 14:11:52 UTC 2016
commit 4895d8288c04577ffc1aed92ee4bffbabbd23295
Author: Nick Mathewson <nickm at torproject.org>
Date: Sat Mar 26 10:11:45 2016 -0400
Do not treat "DOCDOC" as doxygen.
---
src/common/crypto_curve25519.c | 4 ++--
src/common/sandbox.c | 2 +-
src/common/sandbox.h | 2 +-
src/or/channel.c | 2 +-
src/or/channel.h | 2 +-
src/or/circuituse.c | 2 +-
src/or/connection_edge.c | 2 +-
src/or/connection_or.h | 2 +-
src/or/ext_orport.c | 2 +-
src/or/or.h | 4 ++--
src/or/relay.c | 2 +-
src/or/rendcache.c | 4 ++--
src/or/routerkeys.c | 2 +-
src/or/routerlist.c | 2 +-
14 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/common/crypto_curve25519.c b/src/common/crypto_curve25519.c
index baa573b..57c878b 100644
--- a/src/common/crypto_curve25519.c
+++ b/src/common/crypto_curve25519.c
@@ -157,7 +157,7 @@ curve25519_keypair_generate(curve25519_keypair_t *keypair_out,
return 0;
}
-/** DOCDOC */
+/* DOCDOC */
int
curve25519_keypair_write_to_file(const curve25519_keypair_t *keypair,
const char *fname,
@@ -180,7 +180,7 @@ curve25519_keypair_write_to_file(const curve25519_keypair_t *keypair,
return r;
}
-/** DOCDOC */
+/* DOCDOC */
int
curve25519_keypair_read_from_file(curve25519_keypair_t *keypair_out,
char **tag_out,
diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index 96429ce..70c5bbd 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -1082,7 +1082,7 @@ sandbox_intern_string(const char *str)
return str;
}
-/** DOCDOC */
+/* DOCDOC */
static int
prot_strings_helper(strmap_t *locations,
char **pr_mem_next_p,
diff --git a/src/common/sandbox.h b/src/common/sandbox.h
index 4918ad0..2defd8b 100644
--- a/src/common/sandbox.h
+++ b/src/common/sandbox.h
@@ -152,7 +152,7 @@ int sandbox_cfg_allow_open_filename(sandbox_cfg_t **cfg, char *file);
int sandbox_cfg_allow_chmod_filename(sandbox_cfg_t **cfg, char *file);
int sandbox_cfg_allow_chown_filename(sandbox_cfg_t **cfg, char *file);
-/**DOCDOC*/
+/* DOCDOC */
int sandbox_cfg_allow_rename(sandbox_cfg_t **cfg, char *file1, char *file2);
/**
diff --git a/src/or/channel.c b/src/or/channel.c
index 519d106..5f69a08 100644
--- a/src/or/channel.c
+++ b/src/or/channel.c
@@ -2868,7 +2868,7 @@ channel_assert_counter_consistency(void)
(n_channel_bytes_in_queues + n_channel_bytes_passed_to_lower_layer));
}
-/** DOCDOC */
+/* DOCDOC */
static int
is_destroy_cell(channel_t *chan,
const cell_queue_entry_t *q, circid_t *circid_out)
diff --git a/src/or/channel.h b/src/or/channel.h
index 1fb4310..129c0c2 100644
--- a/src/or/channel.h
+++ b/src/or/channel.h
@@ -182,7 +182,7 @@ struct channel_s {
* space should we use?
*/
circ_id_type_bitfield_t circ_id_type:2;
- /** DOCDOC*/
+ /* DOCDOC */
unsigned wide_circ_ids:1;
/** For how many circuits are we n_chan? What about p_chan? */
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 64fcc30..31003ea 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -1674,7 +1674,7 @@ circuit_launch(uint8_t purpose, int flags)
return circuit_launch_by_extend_info(purpose, NULL, flags);
}
-/** DOCDOC */
+/* DOCDOC */
static int
have_enough_path_info(int need_exit)
{
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index f680e1d..754e976 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -904,7 +904,7 @@ connection_ap_mark_as_non_pending_circuit(entry_connection_t *entry_conn)
smartlist_remove(pending_entry_connections, entry_conn);
}
-/** DOCDOC */
+/* DOCDOC */
void
connection_ap_warn_and_unmark_if_pending_circ(entry_connection_t *entry_conn,
const char *where)
diff --git a/src/or/connection_or.h b/src/or/connection_or.h
index 53e1f96..e2ec47a 100644
--- a/src/or/connection_or.h
+++ b/src/or/connection_or.h
@@ -100,7 +100,7 @@ var_cell_t *var_cell_new(uint16_t payload_len);
var_cell_t *var_cell_copy(const var_cell_t *src);
void var_cell_free(var_cell_t *cell);
-/** DOCDOC */
+/* DOCDOC */
#define MIN_LINK_PROTO_FOR_WIDE_CIRC_IDS 4
#endif
diff --git a/src/or/ext_orport.c b/src/or/ext_orport.c
index 584abf6..aa1b3e2 100644
--- a/src/or/ext_orport.c
+++ b/src/or/ext_orport.c
@@ -178,7 +178,7 @@ connection_ext_or_auth_neg_auth_type(connection_t *conn)
return 1;
}
-/** DOCDOC */
+/* DOCDOC */
STATIC int
handle_client_auth_nonce(const char *client_nonce, size_t client_nonce_len,
char **client_hash_out,
diff --git a/src/or/or.h b/src/or/or.h
index 301901e..111d098 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1358,7 +1358,7 @@ typedef struct listener_connection_t {
* in the v3 handshake. The subject key must be a 1024-bit RSA key; it
* must be signed by the identity key */
#define OR_CERT_TYPE_AUTH_1024 3
-/** DOCDOC */
+/* DOCDOC */
#define OR_CERT_TYPE_RSA_ED_CROSSCERT 7
/**@}*/
@@ -3789,7 +3789,7 @@ typedef struct {
* and try a new circuit if the stream has been
* waiting for this many seconds. If zero, use
* our default internal timeout schedule. */
- int MaxOnionQueueDelay; /**<DOCDOC*/
+ int MaxOnionQueueDelay; /*< DOCDOC */
int NewCircuitPeriod; /**< How long do we use a circuit before building
* a new one? */
int MaxCircuitDirtiness; /**< Never use circs that were first used more than
diff --git a/src/or/relay.c b/src/or/relay.c
index 7022c4b..fb8c8e7 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -2374,7 +2374,7 @@ packed_cell_mem_cost(void)
return sizeof(packed_cell_t);
}
-/** DOCDOC */
+/* DOCDOC */
STATIC size_t
cell_queues_get_total_allocation(void)
{
diff --git a/src/or/rendcache.c b/src/or/rendcache.c
index 8b2d3ce..f8206cd 100644
--- a/src/or/rendcache.c
+++ b/src/or/rendcache.c
@@ -53,7 +53,7 @@ STATIC digestmap_t *rend_cache_v2_dir = NULL;
* only rely on the usability of intro points from an internal state. */
STATIC strmap_t *rend_cache_failure = NULL;
-/** DOCDOC */
+/* DOCDOC */
STATIC size_t rend_cache_total_allocation = 0;
/** Initializes the service descriptor cache.
@@ -78,7 +78,7 @@ rend_cache_entry_allocation(const rend_cache_entry_t *e)
return sizeof(*e) + e->len + sizeof(*e->parsed);
}
-/** DOCDOC */
+/* DOCDOC */
size_t
rend_cache_get_total_allocation(void)
{
diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c
index 34e9fc5..efb3cbb 100644
--- a/src/or/routerkeys.c
+++ b/src/or/routerkeys.c
@@ -923,7 +923,7 @@ load_ed_keys(const or_options_t *options, time_t now)
return -1;
}
-/**DOCDOC*/
+/* DOCDOC */
int
generate_ed_link_cert(const or_options_t *options, time_t now)
{
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 31da561..3c9023e 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -662,7 +662,7 @@ static const char *BAD_SIGNING_KEYS[] = {
NULL,
};
-/** DOCDOC */
+/* DOCDOC */
int
authority_cert_is_blacklisted(const authority_cert_t *cert)
{
More information about the tor-commits
mailing list