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

confd parser review #443

Merged
merged 7 commits into from
Nov 16, 2019
Merged

confd parser review #443

merged 7 commits into from
Nov 16, 2019

Conversation

dywisor
Copy link
Contributor

@dywisor dywisor commented Nov 16, 2019 •
edited
Loading

  • use str formatting (printf / sprintf) to improve readability
  • use named regexp capture groups for config line parsing
  • read only files / sym-to-file from CONF_DIR (ignore dirs / devices / ...)
  • minor stuff: eliminate redundant code, use outfile var

follow-up on #435

@dywisor
tlp-readconfs: refactor echo_debug -> printf_debug
9bfce91 
Use string formatting when writing debug messages,
should be more readable.
@dywisor
tlp-readconfs: ignore non-files when reading from CONF_DIR
63d7ec6
@dywisor
tlp-readconfs: write_runconf: use outfile variable
4b48575
@dywisor
tlp-readconfs, parse_configfile: use regexp capture groups
6737ddb 
Don't process the input line twice.
Instead, use groups to capture the variable's name and value.

Since values may or may not be quoted, use individual groups
for each case,

* val_bare    -- value was not quoted
* val_dquoted -- value was inside double quotes ("")

where exactly one of these groups can be defined at any time.
Later on, pick the defined group with a "defined-or"-chain over all variants.
@dywisor
tlp-readconfs: dedup set-debug code
73a77f3 
Setting "debug = 1" does not depend on whether the config
variable is already defined or not, so move it to the outer block.
@dywisor
tlp-readconfs: remove explicit str conversion
743c777 
* cmdline arguments
* names/values read by parse_configfile() are strings
@dywisor
tlp-readconfs, write_runconf(): use str-formatting
cb498ab
@linrunner linrunner merged commit a041fab into linrunner:master Nov 16, 2019
@linrunner
Copy link
Owner

Thank you very much :-)

@mightyllama89 mightyllama89 mentioned this pull request Aug 22, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@dywisor @linrunner