nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix minor typos, two line lengths, and a repeated include

Browse Source
This commit is contained in:
teor 2014-10-23 02:35:46 +11:00
parent 67fdfcf27c
commit c9d0967dd9
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/address.c
View File

@ -883,7 +883,7 @@ tor_addr_copy(tor_addr_t *dest, const tor_addr_t *src)
memcpy(dest, src, sizeof(tor_addr_t));
}
/** Copy a tor_addr_t from <b>src</b> to <b>dest</b>, taking extra case to
/** Copy a tor_addr_t from <b>src</b> to <b>dest</b>, taking extra care to
* copy only the well-defined portions. Used for computing hashes of
* addresses.
*/

7
src/common/compat.c
View File

@ -77,6 +77,7 @@
/* Includes for the process attaching prevention */
#if defined(HAVE_SYS_PRCTL_H) && defined(__linux__)
/* Only use the linux prctl; the IRIX prctl is totally different */
#include <sys/prctl.h>
#elif defined(__APPLE__)
#include <sys/types.h>
@ -110,10 +111,6 @@
#ifdef HAVE_SYS_FILE_H
#include <sys/file.h>
#endif
#if defined(HAVE_SYS_PRCTL_H) && defined(__linux__)
/* Only use the linux prctl; the IRIX prctl is totally different */
#include <sys/prctl.h>
#endif
#ifdef TOR_UNIT_TESTS
#if !defined(HAVE_USLEEP) && defined(HAVE_SYS_SELECT_H)
/* as fallback implementation for tor_sleep_msec */
@ -2883,7 +2880,7 @@ tor_localtime_r(const time_t *timep, struct tm *result)
/** @} */
/** @{ */
/** As gmtimee_r, but defined for platforms that don't have it:
/** As gmtime_r, but defined for platforms that don't have it:
*
* Convert *<b>timep</b> to a struct tm in UTC, and store the value in
* *<b>result</b>. Return the result on success, or NULL on failure.

4
src/common/log.c
View File

@ -371,8 +371,8 @@ pending_log_message_free(pending_log_message_t *msg)
tor_free(msg);
}
/** Return true iff <b>lf</b> would like to receive a message with the specified
* <b>severity</b> in the specified <b>domain</b>.
/** Return true iff <b>lf</b> would like to receive a message with the
* specified <b>severity</b> in the specified <b>domain</b>.
*/
static INLINE int
logfile_wants_message(const logfile_t *lf, int severity,

2
src/or/buffers.c
View File

@ -1912,7 +1912,7 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req,
}
*drain_out = 2u + usernamelen + 1u + passlen;
req->got_auth = 1;
*want_length_out = 7; /* Minimal socks5 sommand. */
*want_length_out = 7; /* Minimal socks5 command. */
return 0;
} else if (req->auth_type == SOCKS_USER_PASS) {
/* unknown version byte */

3
src/test/test_socks.c
View File

@ -392,7 +392,8 @@ test_socks_5_malformed_commands(void *ptr)
/* XXX: Stringified address length > MAX_SOCKS_ADDR_LEN will never happen */
/* SOCKS 5 Send CONNECT [01] to IP address 2.2.2.2:4369, with SafeSocks set */
/** SOCKS 5 Send CONNECT [01] to IP address 2.2.2.2:4369, with SafeSocks set
*/
ADD_DATA(buf, "\x05\x01\x00");
ADD_DATA(buf, "\x05\x01\x00\x01\x02\x02\x02\x02\x11\x11");
tt_int_op(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, 1),==,