Code formatter #8
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
this type of bug will hopefully be no longer possible if always bracing conditional-blocks
another bug due to missing braces
- add script to format the code with; the script checks against the right (latest) version and calls the formatter with the arguments that define the code style; - add punctual pre-formatting changes, that would othewise lead to undesired results, when applying the formatter; - disable formatting on some code chunks that the formatter doesn't properly format: * do-while() interlaced in switch-cases; * one liner switch-cases (not supported by astyle).
code run through astyle
Closed
edsavage
approved these changes
Jun 6, 2018
driver/catalogue.c
Outdated
| ) | ||
| { | ||
| esodbc_stmt_st *stmt = STMH(hstmt); | ||
| SQLRETURN ret; | ||
| SQLWCHAR wbuf[sizeof(SQL_COLUMNS(SQL_COL_CAT)) + | ||
| 3 * ESODBC_MAX_IDENTIFIER_LEN]; | ||
| 3 * ESODBC_MAX_IDENTIFIER_LEN]; |
There was a problem hiding this comment.
The indentation is rather strange here - I'm not sure which of the astyle options is responsible though.
There was a problem hiding this comment.
Indeed. But changing the plus sign (b8cbdd9) makes things better.
| switch(DiagIdentifier) { | ||
| /* Header Fields */ | ||
| case SQL_DIAG_NUMBER: | ||
| if (StringLengthPtr); |
There was a problem hiding this comment.
Good that this was found!
async seems to treat differently the continuations of expressions, depending on where the operators are placed.
- also fix a bug in formatter script parameters handling
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR introduces Artistic Style code formatter and reformats the driver code with it.
The configuration of the formatter makes sure that no single-line blocks are left unbraced; this is valid for both conditionals and loops. A default of the formatter is also removal of trailing line spaces.
During the preparation I have already identified four locations (in two groups) where defects were introduced due to lacking braces; these have been committed part of this PR.
The formatting script will eventually be used in a pre-commit hook.