Pre formatter cleanups #1610

nmathewson · 2019-12-16T19:46:16Z

No description provided.

…lang-format less

This is an automated commit, generated by: perl -i -pe 'next if /define/; s/((?:ENABLE|DISABLE)_GCC_WARNING)$([A-Za-z0-9_\-]+)$/$1(\"-W$2\")/' src/*/*/*.[ch] src/*/*.[ch]

We were actually omitting the semicolon in a few places, leading to confusing indentation and some cocci failures.

Also, include torerr.h from ht.h if we are using raw_assert. Otherwise, our includes need to be ordered so that ht.h comes after util_log.h.

Otherwise our compilation depends on include order.

This gives us the definition of tor_x509_cert_impl_t, and makes us less dependent on include order.

This frees us from some dependencies on include order.

This frees us from a dependency on include order.

Doing this gives us a valid uint64_t type, freeing us from dependencies on include order.

Using these frees us from several dependencies on include order.

Doing this frees us from some assumptions about include order.

This frees us from some dependencies on include order.

This lets us avoid a dependency on include order.

Without this include, our compilation depends more on include order.

This fixes a case where our compilation would depend on include order.

This prevents a dependency on include order.

Without this change, compilation success depends on include order in several tricky ways.

This change means that authmode.h no longer needs to see or_options_t, and frees us from an ordering dependency.

This frees us from a dependency on include order.

We use bool, so we should include stdbool.

coveralls · 2019-12-16T20:47:43Z

Pull Request Test Coverage Report for Build 7581

3 of 4 (75.0%) changed or added relevant lines in 2 files are covered.
5 unchanged lines in 3 files lost coverage.
Overall coverage increased (+0.02%) to 63.022%

Changes Missing Coverage	Covered Lines	Changed/Added Lines	%
src/core/mainloop/connection.h	1	2	50.0%

Files with Coverage Reduction	New Missed Lines	%
src/core/or/channeltls.c	1	42.54%
src/feature/hs/hs_circuit.c	2	41.57%
src/feature/nodelist/nodelist.c	2	71.66%

Totals
Change from base Build 7551:	0.02%
Covered Lines:	49562
Relevant Lines:	78643

💛 - Coveralls

tlyu · 2019-12-16T22:37:31Z

src/lib/cc/compat_compiler.h

 #    define ENABLE_GCC_WARNING(warningopt) \
          PRAGMA_DIAGNOSTIC_(pop)
 #else /* !(defined(__clang__) || GCC_VERSION >= 406) */
 /* older version of gcc: no push/pop support. */
 #    define DISABLE_GCC_WARNING(warningopt) \
-         PRAGMA_DIAGNOSTIC_(ignored PRAGMA_JOIN_STRINGIFY_(-W,warningopt))
+         PRAGMA_DIAGNOSTIC_(ignored PRAGMA_JOIN_STRINGIFY_ warningopt)


Should probably completely delete PRAGMA_JOIN_STRINGIFY_ as was done on L73. Same on L81.

Preprocessor substitution of empty token for undefined macros probably makes this compile, but we probably shouldn't leave it lying around.

…nfuse clang-format less Remove remaining uses of PRAGMA_JOIN_STRINGIFY_: these should have gone away entirely. Caught by Taylor.

nmathewson added 22 commits Dec 16, 2019

Replace DISABLE/ENABLE_GCC_WARNING with something that will confuse c…

7b11da8

…lang-format less

Use new ENABLE/DISABLE_GCC_WARNING

7a6d697

This is an automated commit, generated by: perl -i -pe 'next if /define/; s/((?:ENABLE|DISABLE)_GCC_WARNING)$([A-Za-z0-9_\-]+)$/$1(\"-W$2\")/' src/*/*/*.[ch] src/*/*.[ch]

Remove extra ; from tt_assert() macro definition.

89a9f8b

We were actually omitting the semicolon in a few places, leading to confusing indentation and some cocci failures.

Use raw_assert in ht.h

e5544bd

Also, include torerr.h from ht.h if we are using raw_assert. Otherwise, our includes need to be ordered so that ht.h comes after util_log.h.

Include sys/types.h in fdio.h, for "off_t".

4c8bc06

Otherwise our compilation depends on include order.

Include x509.h in tortls_internal.h.

b5cecec

This gives us the definition of tor_x509_cert_impl_t, and makes us less dependent on include order.

or_options_st.h: Add an include and a struct declaration.

61ffd88

This frees us from some dependencies on include order.

hs_circuit: use struct declaration.

a53b775

This frees us from a dependency on include order.

siphash.h: include stdint.

a7a4a31

Doing this gives us a valid uint64_t type, freeing us from dependencies on include order.

connection.h: new includes and struct declarations

e32725f

Using these frees us from several dependencies on include order.

control_hs.h: use a couple of struct delcarations

166304f

Doing this frees us from some assumptions about include order.

lib/conf: include torint.h in files that use it.

0baa813

This frees us from some dependencies on include order.

timers.h: add declaration for timeval.

439e49e

This frees us from some dependencies on include order.

process.h: add a struct declaration for buf_t.

dac53c9

This lets us avoid a dependency on include order.

routerparse.h: include parsecommon.h when exposing token table.

df6921f

Without this include, our compilation depends more on include order.

hs_circuitmap.h: use a struct declaration

db87109

This fixes a case where our compilation would depend on include order.

consdiffmgr.h: use struct declarations for several types

26a2754

This prevents a dependency on include order.

Include ht.h in all headers that use HT_ENTRY()

5f6b7b6

Without this change, compilation success depends on include order in several tricky ways.

Turn authdir_mode_v3() into a non-inline function

3947387

This change means that authmode.h no longer needs to see or_options_t, and frees us from an ordering dependency.

conscache.h: declare config_line_t structure.

4f15abb

This frees us from a dependency on include order.

process.h: include stdbool.h

68761a2

We use bool, so we should include stdbool.

changes file for 32764.

460e1ad

tlyu reviewed Dec 16, 2019

View changes

fixup! Replace DISABLE/ENABLE_GCC_WARNING with something that will co…

5b3630f

…nfuse clang-format less Remove remaining uses of PRAGMA_JOIN_STRINGIFY_: these should have gone away entirely. Caught by Taylor.

torproject-pusher closed this May 25, 2021

torproject-pusher deleted the branch torproject:master May 25, 2021

torproject / tor Public

Pre formatter cleanups #1610

Pre formatter cleanups #1610

nmathewson commented Dec 16, 2019

coveralls commented Dec 16, 2019 •

edited

tlyu Dec 16, 2019

torproject / tor Public

Pre formatter cleanups #1610

Pre formatter cleanups #1610

Conversation

nmathewson commented Dec 16, 2019

coveralls commented Dec 16, 2019 • edited

Pull Request Test Coverage Report for Build 7581

💛 - Coveralls

tlyu Dec 16, 2019

coveralls commented Dec 16, 2019 •

edited