nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.3'

Browse Source
This commit is contained in:
Nick Mathewson 2020-05-19 09:39:12 -04:00
commit 9b55a62e73
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/ticket34255_043 Normal file
View File

@ -0,0 +1,3 @@
o Documentation:
- Fix several doxygen warnings related to imbalanced groups.
Closes ticket 34255.

6
src/lib/conf/confdecl.h
View File

@ -136,11 +136,11 @@
}, },
/**@}*/ /**@}*/
/* @defgroup STUB_TABLE_MACROS Internal macros: stub table declarations, /** @defgroup STUB_TABLE_MACROS Internal macros: stub table declarations,
* for use when a module is disabled. * for use when a module is disabled.
* Implementation helpers: the regular confdecl macros expand to these * Implementation helpers: the regular confdecl macros expand to these
* when CONF_CONTEXT is defined to LL_TABLE. Don't use them directly. * when CONF_CONTEXT is defined to LL_TABLE. Don't use them directly.
* @{*/ * @{ */
#define BEGIN_CONF_STRUCT__STUB_TABLE(structname) \ #define BEGIN_CONF_STRUCT__STUB_TABLE(structname) \
static const config_var_t structname##_vars[] = { static const config_var_t structname##_vars[] = {
#define END_CONF_STRUCT__STUB_TABLE(structname) \ #define END_CONF_STRUCT__STUB_TABLE(structname) \
@ -166,7 +166,7 @@
* when the macro sees us declare a configuration option "foo" of type STRING, * when the macro sees us declare a configuration option "foo" of type STRING,
* it can emit `config_decl_STRING foo;`, which is an alias for `char *foo`. * it can emit `config_decl_STRING foo;`, which is an alias for `char *foo`.
*/ */
/**{*/ /**@{*/
typedef char *config_decl_STRING; typedef char *config_decl_STRING;
typedef char *config_decl_FILENAME; typedef char *config_decl_FILENAME;
/* Yes, "POSINT" is really an int, and not an unsigned int. For /* Yes, "POSINT" is really an int, and not an unsigned int. For

2
src/lib/container/smartlist.c
View File

@ -652,7 +652,7 @@ smartlist_sort_pointers(smartlist_t *sl)
#define LEFT_CHILD(i) ( 2*(i) + 1 ) #define LEFT_CHILD(i) ( 2*(i) + 1 )
#define RIGHT_CHILD(i) ( 2*(i) + 2 ) #define RIGHT_CHILD(i) ( 2*(i) + 2 )
#define PARENT(i) ( ((i)-1) / 2 ) #define PARENT(i) ( ((i)-1) / 2 )
/** }@ */ /** @} */
/** @{ */ /** @{ */
/** Helper macros for heaps: Given a local variable <b>idx_field_offset</b> /** Helper macros for heaps: Given a local variable <b>idx_field_offset</b>

1
src/lib/string/compat_ctype.c
View File

@ -29,6 +29,7 @@ const uint32_t TOR_ISPRINT_TABLE[8] =
{ 0, 0xffffffff, 0xffffffff, 0x7fffffff, 0, 0, 0, 0x0 }; { 0, 0xffffffff, 0xffffffff, 0x7fffffff, 0, 0, 0, 0x0 };
const uint32_t TOR_ISUPPER_TABLE[8] = { 0, 0, 0x7fffffe, 0, 0, 0, 0, 0 }; const uint32_t TOR_ISUPPER_TABLE[8] = { 0, 0, 0x7fffffe, 0, 0, 0, 0, 0 };
const uint32_t TOR_ISLOWER_TABLE[8] = { 0, 0, 0, 0x7fffffe, 0, 0, 0, 0 }; const uint32_t TOR_ISLOWER_TABLE[8] = { 0, 0, 0, 0x7fffffe, 0, 0, 0, 0 };
/**@}*/
/** Upper-casing and lowercasing tables to map characters to upper/lowercase /** Upper-casing and lowercasing tables to map characters to upper/lowercase
* equivalents. Used by tor_toupper() and tor_tolower(). */ * equivalents. Used by tor_toupper() and tor_tolower(). */

1
src/lib/wallclock/time_to_tm.c
View File

@ -198,3 +198,4 @@ tor_gmtime_r_msg(const time_t *timep, struct tm *result, char **err_out)
return correct_tm(0, timep, result, r, err_out); return correct_tm(0, timep, result, r, err_out);
} }
#endif /* defined(HAVE_GMTIME_R) || ... */ #endif /* defined(HAVE_GMTIME_R) || ... */
/**@}*/