[svn] Cast va_arg(..., int) to short if a short value is expected.

Published in <sxsbshgxfs5.fsf@florida.arsdigita.de>.

diff --git a/src/ChangeLog b/src/ChangeLog
index 3bdb9fa8fc37ecb5a55e5ba3285c1c1164811a96..2ed0bd4a3fc97dc99c9ec6e18baca8a851d3ce94 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-03  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+       * snprintf.c (dopr): Cast the result of va_arg to short int and
+       short unsigned int where these types are expected to be used.
+
 2001-12-03  Hrvoje Niksic  <hniksic@arsdigita.com>
 
        * snprintf.c (dopr): Replace `short int' and `unsigned short int'

diff --git a/src/snprintf.c b/src/snprintf.c
index 237ba5d49420406ffd26cc134444bc03652f87d9..ea8d5002d374e19fc81857c3bfe7a37655f05fb9 100644 (file)
--- a/src/snprintf.c
+++ b/src/snprintf.c
@@ -309,7 +309,7 @@ static int dopr (char *buffer, size_t maxlen, const char *format, va_list args)
       case 'd':
       case 'i':
        if (cflags == DP_C_SHORT) 
-         value = va_arg (args, int);
+         value = (short int)va_arg (args, int);
        else if (cflags == DP_C_LONG)
          value = va_arg (args, long int);
        else if (cflags == DP_C_LLONG)
@@ -321,7 +321,7 @@ static int dopr (char *buffer, size_t maxlen, const char *format, va_list args)
       case 'o':
        flags |= DP_F_UNSIGNED;
        if (cflags == DP_C_SHORT)
-         value = va_arg (args, int);
+         value = (short int)va_arg (args, int);
        else if (cflags == DP_C_LONG)
          value = va_arg (args, unsigned long int);
        else if (cflags == DP_C_LLONG)
@@ -333,7 +333,7 @@ static int dopr (char *buffer, size_t maxlen, const char *format, va_list args)
       case 'u':
        flags |= DP_F_UNSIGNED;
        if (cflags == DP_C_SHORT)
-         value = va_arg (args, int);
+         value = (unsigned short int)va_arg (args, int);
        else if (cflags == DP_C_LONG)
          value = va_arg (args, unsigned long int);
        else if (cflags == DP_C_LLONG)
@@ -347,7 +347,7 @@ static int dopr (char *buffer, size_t maxlen, const char *format, va_list args)
       case 'x':
        flags |= DP_F_UNSIGNED;
        if (cflags == DP_C_SHORT)
-         value = va_arg (args, int);
+         value = (short int)va_arg (args, int);
        else if (cflags == DP_C_LONG)
          value = va_arg (args, unsigned long int);
        else if (cflags == DP_C_LLONG)