Commit 06e5b228 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

minor cleanups 


svn:r8622
parent 8ba5471d

ChangeLog

+4 −4
Original line number Diff line number Diff line
@@ -65,9 +65,9 @@ Changes in version 0.1.2.2-alpha - 2006-10-?? 
      a hostname; any router can call itself Unnamed; directory

      authorities will never allocate Unnamed to any particular router;

      clients won't believe that any router is the canonical Unnamed.

    - Only include function names in log messages for debugging messages;

      in other cases, the content of the message should be clear on its

      own, and including the function name only seems to confuse users.

    - Only include function names in log messages for info/debug messages.

      For notice/warn/err, the content of the message should be clear on

      its own, and printing the function name only seems to confuse users.

    - Avoid some false positives during reachability testing: don't try

      to test via a server that's on the same /24 as us.

    - New controller event to alert the controller when our server
@@ -176,7 +176,7 @@ Changes in version 0.1.2.2-alpha - 2006-10-?? 
    - Be clearer that the *ListenAddress directives can be repeated

      multiple times.



    (stopped at r8519)

    (stopped at r8536)

    - Build correctly for use on OS X platforms with case-sensitive

      filesystems.

doc/tor-spec.txt

+1 −1
Original line number Diff line number Diff line
@@ -727,7 +727,7 @@ TODO: 
   with a REASON_NOTDIRECTORY RELAY_END cell.



   [RELAY_BEGIN_DIR was not supported before Tor 0.1.2.2-alpha; clients

   SHOULD NOT send it to routers running earlier version of Tor.]

   SHOULD NOT send it to routers running earlier versions of Tor.]



6.3. Closing streams

src/common/container.c

+4 −4
Original line number Diff line number Diff line
@@ -542,7 +542,7 @@ smartlist_heapify(smartlist_t *sl, 
}



/** Insert <b>item</b> into the heap stored in <b>sl</b>, where order

 * is determined by <b>compare</b> */

 * is determined by <b>compare</b>. */

void

smartlist_pqueue_add(smartlist_t *sl,

                     int (*compare)(const void *a, const void *b),
@@ -636,7 +636,7 @@ strmap_entries_eq(strmap_entry_t *a, strmap_entry_t *b) 
  return !strcmp(a->key, b->key);

}



/** Helper: return a hash value for a strmap_entry_t */

/** Helper: return a hash value for a strmap_entry_t. */

static INLINE unsigned int

strmap_entry_hash(strmap_entry_t *a)

{
@@ -650,7 +650,7 @@ digestmap_entries_eq(digestmap_entry_t *a, digestmap_entry_t *b) 
  return !memcmp(a->key, b->key, DIGEST_LEN);

}



/** Helper: return a hash value for a digest_map_t */

/** Helper: return a hash value for a digest_map_t. */

static INLINE unsigned int

digestmap_entry_hash(digestmap_entry_t *a)

{
@@ -1051,7 +1051,7 @@ digestmap_isempty(digestmap_t *map) 
  return HT_EMPTY(&map->head);

}



/** Return the number of items in <b>map</b> */

/** Return the number of items in <b>map</b>. */

int

strmap_size(strmap_t *map)

{

src/or/circuitbuild.c

+2 −2
Original line number Diff line number Diff line
@@ -1816,7 +1816,7 @@ entry_guard_set_status(entry_guard_t *e, routerinfo_t *ri, 
  return changed;

}



/** Return true iff enought time has passed since we last tried connect to the

/** Return true iff enough time has passed since we last tried connect to the

 * unreachable guard <b>e</b> that we're willing to try again. */

static int

entry_is_time_to_retry(entry_guard_t *e, time_t now)
@@ -1896,7 +1896,7 @@ is_an_entry_guard(char *digest) 
}



/** Dump a description of our list of entry guards to the log at level

 * <b>severity</b> */

 * <b>severity</b>. */

static void

log_entry_guards(int severity)

{

src/or/connection_edge.c

+1 −2
Original line number Diff line number Diff line
@@ -2144,7 +2144,7 @@ connection_exit_connect(edge_connection_t *edge_conn) 
 * bridge connection with a socketpair, create a new directory conn, and join

 * them together.  Return 0 on success (or if there was an error we could send

 * back an end cell for).  Return -1 if the circuit needs to be torn down.

 * Either connects exit_conn, or frees it, or marks it as appropriate.

 * Either connects exit_conn, or frees it, or marks it, as appropriate.

 */

static int

connection_exit_connect_dir(edge_connection_t *exit_conn)
@@ -2187,7 +2187,6 @@ connection_exit_connect_dir(edge_connection_t *exit_conn) 
  if (connection_add(TO_CONN(exit_conn))<0) {

    connection_edge_end(exit_conn, END_STREAM_REASON_RESOURCELIMIT,

                        exit_conn->cpath_layer);

    /* XXXX Have I got the free/mark distinction right? -NM */

    connection_free(TO_CONN(exit_conn));

    connection_free(TO_CONN(dir_conn));

    return 0;