diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-02-04 10:27:44 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-02-04 10:27:44 +0100 |
| commit | ba1b3afd50913473f3036a63b4a82d7ba5c42009 (patch) | |
| tree | 9dff0ddec4bf8b927a025b4bf9882cb1731170f3 /linux/dev/lib/vsprintf.c | |
| parent | bfdb3be16e5a20eebc97b3ca613d9a4da4465533 (diff) | |
| parent | 51e87d005139a435cd846ac5c224eed5042c4fa0 (diff) | |
Merge branch 'master' into master-gdb_stubs
Diffstat (limited to 'linux/dev/lib/vsprintf.c')
| -rw-r--r-- | linux/dev/lib/vsprintf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/dev/lib/vsprintf.c b/linux/dev/lib/vsprintf.c index 0beb7471..541ec650 100644 --- a/linux/dev/lib/vsprintf.c +++ b/linux/dev/lib/vsprintf.c @@ -328,9 +328,9 @@ linux_vsprintf (char *buf, const char *fmt, va_list args) num = va_arg (args, unsigned long); else if (qualifier == 'h') if (flags & SIGN) - num = va_arg (args, short); + num = (short) va_arg (args, int); else - num = va_arg (args, unsigned short); + num = (unsigned short) va_arg (args, unsigned int); else if (flags & SIGN) num = va_arg (args, int); else |