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.

Sign up for GitHub

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

Jump to bottom

#348 removal fgets #403

Merged
merged 17 commits into from
Sep 9, 2023
Merged

#348 removal fgets #403

merged 17 commits into from
Sep 9, 2023

Conversation

darvark
Copy link
Contributor

@darvark darvark commented Aug 20, 2023

Recreated branch for replacement fgets with getline. (Recreating suggested by @zcsahok.

zcsahok
zcsahok reviewed Aug 20, 2023
View reviewed changes
src/parse_logcfg.c Outdated Show resolved Hide resolved
zcsahok
zcsahok reviewed Aug 21, 2023
View reviewed changes
src/readcalls.c Outdated Show resolved Hide resolved
zcsahok
zcsahok reviewed Aug 21, 2023
View reviewed changes
test/rules/run_tlf.py Outdated Show resolved Hide resolved
zcsahok
zcsahok reviewed Aug 21, 2023
View reviewed changes
test/test_readcalls.c Outdated Show resolved Hide resolved
zcsahok
zcsahok reviewed Aug 21, 2023
View reviewed changes
test/test_rules.c Outdated Show resolved Hide resolved
N0NB and others added 3 commits August 21, 2023 18:47
@N0NB
Update KSQP rules (Tlf#402)
13d0fc3 
* Remove 'DC' for states mults list as it is not a mult for this event.

* Break lines of all mult lists at ten entities per line for ease of counting.

* Add link to KSQP 2023 rules.
@VictorDenisov
Update California QSO party multipliers (Tlf#405)
53a234f 
This year formerly combined entities are expanded into individual multipliers:
https://cqp.org/pdf/cqp2023_rules_changes.pdf
@darvark
remove debug prints
b397b08
zcsahok
zcsahok reviewed Aug 25, 2023
View reviewed changes
src/readcalls.c Outdated Show resolved Hide resolved
zcsahok
zcsahok reviewed Aug 25, 2023
View reviewed changes
src/bandmap.c Outdated Show resolved Hide resolved
zcsahok
zcsahok reviewed Aug 25, 2023
View reviewed changes
src/checklogfile.c Outdated Show resolved Hide resolved
zcsahok
zcsahok reviewed Aug 25, 2023
View reviewed changes
src/checklogfile.c Outdated Show resolved Hide resolved
zcsahok
zcsahok reviewed Aug 26, 2023
View reviewed changes
src/readcalls.c Outdated Show resolved Hide resolved
@darvark
Copy link
Contributor Author

darvark commented Aug 26, 2023

Finally, Thank you @zcsahok, it would take some time for me to track all those errors :)

zcsahok
zcsahok reviewed Aug 27, 2023
View reviewed changes
test/test_readcalls.c Outdated Show resolved Hide resolved
@zcsahok
Copy link
Member

zcsahok commented Aug 28, 2023

Please do not merge master into the PR branch. It shall contain only your changes related to the PR.
The PR branch will then be merged into master.

@darvark
Copy link
Contributor Author

darvark commented Aug 30, 2023

Please do not merge master into the PR branch. It shall contain only your changes related to the PR. The PR branch will then be merged into master.

It's not merge, I've execute git rebase command, but finally git marks this as merge. Without this I can't have my branch up to date to main, and probably lots of conflicts will hit us when we try to merge. I can guarantee that this was rebase not merge.

@zcsahok
Copy link
Member

zcsahok commented Sep 9, 2023

One shall leave merge conflict resolution to the maintainers unless explicitly requested.
Rebasing is only rarely required and in this case there were no conflicts, so no action was needed.

Note - mostly to myself -: in readcalls.c at line 154 it must be ensured that line length == LOGLINELEN, else the log file is corrupt.
I'll fix this in the subsequent rework of file reading.

@zcsahok zcsahok merged commit 107a008 into Tlf:master Sep 9, 2023
2 checks passed
@zcsahok zcsahok mentioned this pull request Sep 9, 2023
Closed
@darvark darvark deleted the 348-getline branch December 23, 2023 18:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zcsahok zcsahok zcsahok left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@darvark @zcsahok @N0NB @VictorDenisov