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

Remove code duplication found in gravit.sh gravity_ParseFileIntoDomains() #1566

Merged
merged 2 commits into from
May 28, 2023

Conversation

yubiuser
Copy link
Member

What does this PR aim to accomplish?:

With the transition of parseList() from gravity.sh to FTL realm some code duplication occurred. Duplicated code is from gravity_ParseFileIntoDomains()

https://github.com/pi-hole/pi-hole/blob/50d67dce73e122d98026ab2a4b30255efd9b05fc/gravity.sh#L639-L667

No all input modifications were duplicated into FTL so we could not remove gravity_ParseFileIntoDomains completely.

How does this PR accomplish the above?:

Removes the duplicates

P.S. It would also be possible to move the whole gravity_ParseFileIntoDomains also into FTL's realm, however this would require more modifications (in core and FTL


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code and I have tested my changes.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)
  6. I have checked that another pull request for this purpose does not exist.
  7. I have considered, and confirmed that this submission will be valuable to others.
  8. I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  9. I give this submission freely, and claim no ownership to its content.

  • I have read the above and my PR is ready for review. Check this box to confirm

…ns()

Signed-off-by: Christian König <ckoenig@posteo.de>
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser yubiuser requested a review from DL6ER May 27, 2023 20:46
@DL6ER DL6ER merged commit 78c16f3 into development May 28, 2023
@DL6ER DL6ER deleted the tweak/gravity_1 branch May 28, 2023 05:41
@DL6ER DL6ER mentioned this pull request May 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants