X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Fformatwr.c;h=8a2e57e1af027e61a51639bd8e1bca650dcbd548;hb=888d1c49ed7cea0f272f520a74be35a32032bd6e;hp=1e4ae0c9c44311c1dd689ff889c8fe742222bc23;hpb=af9c555446161016fdd76c1cdff96ce76bb6cba2;p=bertos.git

diff --git a/mware/formatwr.c b/mware/formatwr.c
index 1e4ae0c9..8a2e57e1 100755
--- a/mware/formatwr.c
+++ b/mware/formatwr.c
@@ -53,6 +53,12 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.17  2005/11/04 17:43:27  bernie
+ *#* Fix for LP64 architectures; Add some more tests.
+ *#*
+ *#* Revision 1.16  2005/07/19 07:25:46  bernie
+ *#* Use appconfig.h instead of cfg/config.h.
+ *#*
  *#* Revision 1.15  2005/04/11 19:10:28  bernie
  *#* Include top-level headers from cfg/ subdir.
  *#*
@@ -81,8 +87,8 @@
 #include "formatwr.h"
 #include <mware/pgm.h>
 #include <mware/hex.h>
-#include <cfg/config.h> /* CONFIG_ macros */
 #include <cfg/debug.h> /* ASSERT */
+#include <appconfig.h> /* CONFIG_ macros */
 
 #ifndef CONFIG_PRINTF_N_FORMATTER
 	/*! Disable the arcane %n formatter. */
@@ -589,15 +595,15 @@ NEXT_FLAG:
 #if defined(__AVR__) || defined(__I196__) /* 16bit pointers */
 					ulong = (unsigned long)(unsigned short)va_arg(ap, char *);
 #else /* 32bit pointers */
-				ulong = (unsigned long)va_arg(ap, char *);
+					ulong = (unsigned long)va_arg(ap, char *);
 #endif /* 32bit pointers */
-				else if (sizeof(short) == sizeof(int))
-					ulong = flags.l_L_modifier ?
-						va_arg(ap, unsigned long) : (unsigned long)va_arg(ap, unsigned int);
+				else if (flags.l_L_modifier)
+					ulong = va_arg(ap, unsigned long);
+				else if (flags.h_modifier)
+					ulong = (unsigned long)(unsigned short)va_arg(ap, unsigned int);
 				else
-					ulong = flags.h_modifier ?
-						(unsigned long)(unsigned short) va_arg(ap, int)
-						: (unsigned long)va_arg(ap, int);
+					ulong = va_arg(ap, unsigned int);
+
 				flags.div_factor =
 #if CONFIG_PRINTF_OCTAL_FORMATTER
 					(format_flag == 'o') ? DIV_OCT :
@@ -608,32 +614,18 @@ NEXT_FLAG:
 
 			case 'd':
 			case 'i':
-				if (sizeof(short) == sizeof(long))
-				{
-					if ( (long)(ulong = va_arg(ap, unsigned long)) < 0)
-					{
-						flags.plus_space_flag = PSF_MINUS;
-						ulong = (unsigned long)(-((signed long)ulong));
-					}
-				}
-				else if (sizeof(short) == sizeof(int))
-				{
-					if ( (long)(ulong = flags.l_L_modifier ?
-								va_arg(ap,unsigned long) : (unsigned long)va_arg(ap,int)) < 0)
-					{
-						flags.plus_space_flag = PSF_MINUS;
-						ulong = (unsigned long)(-((signed long)ulong));
-					}
-				}
+				if (flags.l_L_modifier)
+					ulong = (unsigned long)(long)va_arg(ap, long);
 				else
+					ulong = (unsigned long)(long)va_arg(ap, int);
+
+				/* Extract sign */
+				if ((signed long)ulong < 0)
 				{
-					if ( (signed long)(ulong = (unsigned long) (flags.h_modifier ?
-									(short) va_arg(ap, int) : va_arg(ap,int))) < 0)
-					{
-						flags.plus_space_flag = PSF_MINUS;
-						ulong = (unsigned long)(-((signed long)ulong));
-					}
+					flags.plus_space_flag = PSF_MINUS;
+					ulong = (unsigned long)(-((signed long)ulong));
 				}
+
 				flags.div_factor = DIV_DEC;
 
 				/* Now convert to digits */