Fix debug printing of SQL(U)LEN variables #233
Merged
Conversation
This file contains hidden or 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 fixes the debug printing of SQL(U)LEN variable types. This type is defined as a long on WIN32, but a __int64 on WIN64. The "%llu"/"%lld" specifier had be used from the start, before the need for an x86 driver was considered and stayed like that mostly since. The values logged by an x86 drivers contains the actual values of the variable, but one needs to convert to hexa, remove the upper 4 byte and convert back, which is cumbersome. The values are now promoted to a (u)int64_t in the logging statements, so printf will always log the correct value. This change also updates some other few incorrect specifiers.
droberts195
reviewed
Mar 27, 2020
driver/tracing.h
Outdated
| case 'N': /* long/int64_t unsigned */ \ | ||
| _n = snprintf(_BUFF + _ps, _AVAIL(_ps), "%llu", \ | ||
| val ? *(uint64_t *)(uintptr_t)val : 0); \ | ||
| val ? (int64_t)*(SQLULEN *)(uintptr_t)val : 0); \ |
There was a problem hiding this comment.
Should this one be uint64_t to match llu?
Collaborator
Author
There was a problem hiding this comment.
It should indeed, I've updated it. Thanks for catching it.
- fix cast for '%llu' specifier to uint64_t
bpintea
added a commit
that referenced
this pull request
Mar 30, 2020
* Fix debug printing of SQL(U)LEN variables This fixes the debug printing of SQL(U)LEN variable types. This type is defined as a long on WIN32, but a __int64 on WIN64. The "%llu"/"%lld" specifier had be used from the start, before the need for an x86 driver was considered and stayed like that mostly since. The values logged by an x86 drivers contains the actual values of the variable, but one needs to convert to hexa, remove the upper 4 byte and convert back, which is cumbersome. The values are now promoted to a (u)int64_t in the logging statements, so printf will always log the correct value. This change also updates some other few incorrect specifiers. * address review comments - fix cast for '%llu' specifier to uint64_t (cherry picked from commit bd81338)
bpintea
added a commit
that referenced
this pull request
Mar 30, 2020
* Fix debug printing of SQL(U)LEN variables This fixes the debug printing of SQL(U)LEN variable types. This type is defined as a long on WIN32, but a __int64 on WIN64. The "%llu"/"%lld" specifier had be used from the start, before the need for an x86 driver was considered and stayed like that mostly since. The values logged by an x86 drivers contains the actual values of the variable, but one needs to convert to hexa, remove the upper 4 byte and convert back, which is cumbersome. The values are now promoted to a (u)int64_t in the logging statements, so printf will always log the correct value. This change also updates some other few incorrect specifiers. * address review comments - fix cast for '%llu' specifier to uint64_t (cherry picked from commit bd81338)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 fixes the debug printing of SQL(U)LEN variable types.
This type is defined as a
longon WIN32, but a__int64on WIN64.The "%llu"/"%lld" specifier had been used from the start, before the need
for an x86 driver was considered and stayed like that mostly since.
The values logged by an x86 drivers contains the actual values of the
variable, but one needs to convert to hexa, remove the upper 4 byte and
convert back to decimal, which is cumbersome.
The values are now promoted to a
(u)int64_tin the logging statements,so printf will always log the correct value.
This change also updates some other few incorrect specifiers.