1
0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00

Fixes to allow this to pass SGI compiler in -fullwarn mode (with one

annoying exception I'm still looking at :-).
Jeremy.
This commit is contained in:
Jeremy Allison
-
parent 1f225abfbe
commit 9cade656e2

View File

@ -278,9 +278,9 @@ static void dopr (char *buffer, size_t maxlen, const char *format, va_list args)
if (cflags == DP_C_SHORT) if (cflags == DP_C_SHORT)
value = va_arg (args, unsigned short int); value = va_arg (args, unsigned short int);
else if (cflags == DP_C_LONG) else if (cflags == DP_C_LONG)
value = va_arg (args, unsigned long int); value = (long)va_arg (args, unsigned long int);
else else
value = va_arg (args, unsigned int); value = (long)va_arg (args, unsigned int);
fmtint (buffer, &currlen, maxlen, value, 8, min, max, flags); fmtint (buffer, &currlen, maxlen, value, 8, min, max, flags);
break; break;
case 'u': case 'u':
@ -288,9 +288,9 @@ static void dopr (char *buffer, size_t maxlen, const char *format, va_list args)
if (cflags == DP_C_SHORT) if (cflags == DP_C_SHORT)
value = va_arg (args, unsigned short int); value = va_arg (args, unsigned short int);
else if (cflags == DP_C_LONG) else if (cflags == DP_C_LONG)
value = va_arg (args, unsigned long int); value = (long)va_arg (args, unsigned long int);
else else
value = va_arg (args, unsigned int); value = (long)va_arg (args, unsigned int);
fmtint (buffer, &currlen, maxlen, value, 10, min, max, flags); fmtint (buffer, &currlen, maxlen, value, 10, min, max, flags);
break; break;
case 'X': case 'X':
@ -300,9 +300,9 @@ static void dopr (char *buffer, size_t maxlen, const char *format, va_list args)
if (cflags == DP_C_SHORT) if (cflags == DP_C_SHORT)
value = va_arg (args, unsigned short int); value = va_arg (args, unsigned short int);
else if (cflags == DP_C_LONG) else if (cflags == DP_C_LONG)
value = va_arg (args, unsigned long int); value = (long)va_arg (args, unsigned long int);
else else
value = va_arg (args, unsigned int); value = (long)va_arg (args, unsigned int);
fmtint (buffer, &currlen, maxlen, value, 16, min, max, flags); fmtint (buffer, &currlen, maxlen, value, 16, min, max, flags);
break; break;
case 'f': case 'f':
@ -353,7 +353,7 @@ static void dopr (char *buffer, size_t maxlen, const char *format, va_list args)
{ {
long int *num; long int *num;
num = va_arg (args, long int *); num = va_arg (args, long int *);
*num = currlen; *num = (long int)currlen;
} }
else else
{ {
@ -547,7 +547,7 @@ static long round (LDOUBLE value)
{ {
long intpart; long intpart;
intpart = value; intpart = (long)value;
value = value - intpart; value = value - intpart;
if (value >= 0.5) if (value >= 0.5)
intpart++; intpart++;
@ -592,7 +592,7 @@ static void fmtfp (char *buffer, size_t *currlen, size_t maxlen,
if (flags & DP_F_UP) caps = 1; /* Should characters be upper case? */ if (flags & DP_F_UP) caps = 1; /* Should characters be upper case? */
#endif #endif
intpart = ufvalue; intpart = (long)ufvalue;
/* /*
* Sorry, we only support 9 digits past the decimal because of our * Sorry, we only support 9 digits past the decimal because of our