Skip to content

Conversation

@gustafn
Copy link
Contributor

@gustafn gustafn commented Jul 24, 2020

This is a follow-up commit to #12320 and #12460 and concerns all the .c- and .h-files of the project. The discussion in #12320 showed interest in source code changes, which are provided by this pull request. The changes are relative to the master branch of GitHub from Thu Jul 23 17:40:40 2020.

Checklist
  • documentation is added or updated

Copy link
Contributor

@paulidale paulidale left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A marathon effort. A couple of mistakes and some suggestions.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The various TIME_STAMP macros should be updated in due course. It doesn't have to be in this PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since i had to redo several steps to get a merge-free PR on the updated master, i've addressed as well the TIME_STAMP macros in the latest commit.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is wrong: sendfile system call or even sendfile(2) system call.

Copy link
Member

@levitte levitte left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmmm, US vs UK english stuff? (I've only marked a few)

apps/cmp.c Outdated
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes are applying the recommended rules of the Linux Documentation Project https://man7.org/linux/man-pages/man7/man-pages.7.html

These changes are as well included in openssl/util/find-doc-nits

apps/cms.c Outdated
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

apps/openssl.c Outdated
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

apps/s_client.c Outdated
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

apps/s_server.c Outdated
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

apps/s_server.c Outdated
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

apps/ts.c Outdated
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Zeros is plural and zeroes is a verb.

@gustafn
Copy link
Contributor Author

gustafn commented Aug 4, 2020

To address the comment "US vs UK english stuff?" directly:
as discussed in #12299 i've left out any changes addressing the "US vs. UK" question. The code base is a mixture of the US and UK spelling conventions, but closer to US.

@gustafn
Copy link
Contributor Author

gustafn commented Aug 19, 2020

Hmm, i've resolved the conflicts of this pull requests by merging with master (The conflicts were introduced by the master branch evolving). But now, all the changes that happened in the meantime are showing up as changes in my last commit. i should probably undo my merge.

@t8m
Copy link
Member

t8m commented Aug 19, 2020

Please do not do merge commits as they are not allowed. Could you please git rebase instead?

@gustafn
Copy link
Contributor Author

gustafn commented Aug 19, 2020

ok. i'll undo make an rebase attempt.

@gustafn gustafn force-pushed the master-src-typography branch from 44b87cc to 18cfbd0 Compare August 19, 2020 16:40
@t8m
Copy link
Member

t8m commented Aug 20, 2020

There are still 2 merge commits.

@gustafn
Copy link
Contributor Author

gustafn commented Aug 20, 2020

These merges were the result of the resolving the conflicts (on a "git pull upstream"). So, i have probably reset everything to my starting point from master, update then master (should be free of conflicts) and trying the reapply my changes afterwards. Probably, one gets as well merges, when doing a "Resolve conflicts" via the GitHub interface.

@t8m
Copy link
Member

t8m commented Aug 20, 2020

Yes, unfortunately resolving conflicts via the GitHub interface cannot be done.

@gustafn gustafn force-pushed the master-src-typography branch from 6c5cc58 to c78d3d9 Compare August 22, 2020 14:54
@gustafn
Copy link
Contributor Author

gustafn commented Aug 23, 2020

What I have done: since later commits on master on files that were changed in this PR lead to merges (which are not wanted), i undid all my changes, rebased the branch on master and applied the changes again. Therefore, this PR is merge-free.

@t8m t8m added branch: master Applies to master branch triaged: cleanup The issue/pr deals with cleanup of comments/docs not altering code significantly labels Aug 4, 2021
@t8m t8m added this to the Post 3.0.0 milestone Sep 24, 2021
@t8m
Copy link
Member

t8m commented Sep 24, 2021

Could you please rebase if you're still interested?

@gustafn
Copy link
Contributor Author

gustafn commented Sep 25, 2021

i will try to revamp it, but i will take me a few days...

@gustafn
Copy link
Contributor Author

gustafn commented Sep 30, 2021

It seems that the "push force" i used to get this voluminous PR in sync again closed the PR. The new one is in #16712

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch: master Applies to master branch triaged: cleanup The issue/pr deals with cleanup of comments/docs not altering code significantly

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants