Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ticket32883 #1635

Merged
3 commits merged into from Jan 14, 2020
Merged

Ticket32883 #1635

3 commits merged into from Jan 14, 2020

Conversation

nmathewson
Copy link
Contributor

No description provided.

When we updated main.c to use the same entry points as tor_api.h, we
didn't update ntmain.c.  This led to bugs as the two got out of
sync.

There are two calls that we drop in this patch: first, I drop the
call to set_main_thread(), since that's redundant with the init
function in compat_winthreads.c (but see #32884).  Second, I drop
the check for CMD_RUN_TOR: I'll add that back with a subsequent
commit.

Closes ticket 32883.
This lets us simplify main.c a little, and avoid a practracker
exception.

Followup from #32883.
@coveralls
Copy link

Pull Request Test Coverage Report for Build 7682

  • 3 of 7 (42.86%) changed or added relevant lines in 1 file are covered.
  • 1 unchanged line in 1 file lost coverage.
  • Overall coverage decreased (-0.002%) to 63.105%

Changes Missing Coverage Covered Lines Changed/Added Lines %
src/app/main/main.c 3 7 42.86%
Files with Coverage Reduction New Missed Lines %
src/app/main/main.c 1 22.02%
Totals Coverage Status
Change from base Build 7676: -0.002%
Covered Lines: 49692
Relevant Lines: 78745

💛 - Coveralls

@ghost ghost merged commit b6f0996 into torproject:master Jan 14, 2020
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants