diff options
| author | hunt <hunt> | 2006-07-21 00:01:37 +0000 |
|---|---|---|
| committer | hunt <hunt> | 2006-07-21 00:01:37 +0000 |
| commit | 428cd03159f5b1be72d06ea5eb110e9238dae4e3 (patch) | |
| tree | fcf2818ce5eb48bca696eb882b82dfc3ece3dca0 | |
| parent | 91ff416b8a764b61b4f4c290f74a90fe8326cb3b (diff) | |
| download | systemtap-steved-428cd03159f5b1be72d06ea5eb110e9238dae4e3.tar.gz systemtap-steved-428cd03159f5b1be72d06ea5eb110e9238dae4e3.tar.xz systemtap-steved-428cd03159f5b1be72d06ea5eb110e9238dae4e3.zip | |
2006-07-20 Martin Hunt <hunt@redhat.com>
* vsprintf.c (_stp_vsnprintf): %p format fixes.
| -rw-r--r-- | runtime/ChangeLog | 4 | ||||
| -rw-r--r-- | runtime/vsprintf.c | 13 |
2 files changed, 12 insertions, 5 deletions
diff --git a/runtime/ChangeLog b/runtime/ChangeLog index 40606c6c..52c5d5e9 100644 --- a/runtime/ChangeLog +++ b/runtime/ChangeLog @@ -1,3 +1,7 @@ +2006-07-20 Martin Hunt <hunt@redhat.com> + + * vsprintf.c (_stp_vsnprintf): %p format fixes. + 2006-07-14 Josh Stone <joshua.i.stone@intel.com> PR 2922 diff --git a/runtime/vsprintf.c b/runtime/vsprintf.c index 7abb5dc5..4582ad83 100644 --- a/runtime/vsprintf.c +++ b/runtime/vsprintf.c @@ -296,12 +296,14 @@ int _stp_vsnprintf(char *buf, size_t size, const char *fmt, va_list args) case 'p': len = 2*sizeof(void *) + 2; - if (field_width == -1) { + flags |= STP_ZEROPAD; + + if (field_width == -1) field_width = len; - flags |= STP_ZEROPAD; - } + if (!(flags & STP_LEFT)) { - while (len < field_width--) { + while (len < field_width) { + field_width--; if (str <= end) *str = ' '; ++str; @@ -315,9 +317,10 @@ int _stp_vsnprintf(char *buf, size_t size, const char *fmt, va_list args) *str++ = 'x'; field_width--; } + str = number(str, end, (unsigned long) va_arg(args, int64_t), - 16, field_width, precision, flags); + 16, field_width, field_width, flags); continue; case 'n': |