[ros-diffs] [gschneider] 42398: Fix formatting

Author: gschneider
Date: Wed Aug  5 01:32:38 2009
New Revision: 42398

URL: http://svn.reactos.org/svn/reactos?rev=42398&view=rev
Log:
Fix formatting

Modified:
    trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c

Modified: trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/lnx_spri…
==============================================================================
--- trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c [iso-8859-1] Wed Aug  5 01:32:38 2009
@@ -20,512 +20,511 @@
 #include <wchar.h>
 #include <tchar.h>
 
-#define ZEROPAD	1		/* pad with zero */
-#define SIGN	2		/* unsigned/signed */
-#define PLUS	4		/* show plus */
-#define SPACE	8		/* space if plus */
-#define LEFT	16		/* left justified */
-#define SPECIAL	32		/* 0x */
-#define LARGE	64		/* use 'ABCDEF' instead of 'abcdef' */
-#define ZEROTRUNC	128	/* truncate zero's */
-#define REMOVEHEX	256	/* remove 0x from BASE 16 */
+#define ZEROPAD     1  /* pad with zero */
+#define SIGN        2  /* unsigned/signed */
+#define PLUS        4  /* show plus */
+#define SPACE       8  /* space if plus */
+#define LEFT       16  /* left justified */
+#define SPECIAL    32  /* 0x */
+#define LARGE      64  /* use 'ABCDEF' instead of 'abcdef' */
+#define ZEROTRUNC 128  /* truncate zero's */
+#define REMOVEHEX 256  /* remove 0x from BASE 16 */
 
 static
 __inline
 int
 do_div(long long *n, int base)
 {
-    int a;
-    a = ((unsigned long long) *n) % (unsigned) base;
-    *n = ((unsigned long long) *n) / (unsigned) base;
-    return a;
+  int a;
+  a = ((unsigned long long) *n) % (unsigned) base;
+  *n = ((unsigned long long) *n) / (unsigned) base;
+  return a;
 }
 
 
 static int skip_atoi(const char **s)
 {
-	int i=0;
-
-	while (isdigit(**s))
-		i = i*10 + *((*s)++) - '0';
-	return i;
+  int i=0;
+
+  while (isdigit(**s))
+    i = i*10 + *((*s)++) - '0';
+  return i;
 }
 
 
 static char *
 number(char * buf, char * end, long long num, int base, int size, int precision, int
type)
 {
-	char c,sign,tmp[66];
-	const char *digits;
-	const char *small_digits = "0123456789abcdefghijklmnopqrstuvwxyz";
-	const char *large_digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-	int i;
-
-	digits = (type & LARGE) ? large_digits : small_digits;
-	if (type & LEFT)
-		type &= ~ZEROPAD;
-	if (base < 2 || base > 36)
-		return 0;
-	c = (type & ZEROPAD) ? '0' : ' ';
-	sign = 0;
-	if (type & SIGN) {
-		if (num < 0) {
-			sign = '-';
-			num = -num;
-			size--;
-		} else if (type & PLUS) {
-			sign = '+';
-			size--;
-		} else if (type & SPACE) {
-			sign = ' ';
-			size--;
-		}
-	}
-
-	if ((type & SPECIAL) && ((type & REMOVEHEX) == 0)) {
-		if (base == 16)
-			size -= 2;
-
-	}
-	i = 0;
-	if ((num == 0) && (precision !=0))
-		tmp[i++] = '0';
-	else while (num != 0)
-		tmp[i++] = digits[do_div(&num,base)];
-	if (i > precision)
-		precision = i;
-	size -= precision;
-	if (!(type&(ZEROPAD+LEFT))) {
-		while(size-->0) {
-			if (buf <= end)
-				*buf = ' ';
-			++buf;
-		}
-	}
-	if (sign) {
-		if (buf <= end)
-			*buf = sign;
-		++buf;
-	}
-
-	if ((type & SPECIAL) && ((type & REMOVEHEX) == 0)) {
-		 if (base==16) {
-			if (buf <= end)
-				*buf = '0';
-			++buf;
-			if (buf <= end)
-				*buf = digits[33];
-			++buf;
-		}
-	}
-
-	if (!(type & LEFT)) {
-		while (size-- > 0) {
-			if (buf <= end)
-				*buf = c;
-			++buf;
-		}
-	}
-	while (i < precision--) {
-		if (buf <= end)
-			*buf = '0';
-		++buf;
-	}
-	while (i-- > 0) {
-		if (buf <= end)
-			*buf = tmp[i];
-		++buf;
-	}
-	while (size-- > 0) {
-		if (buf <= end)
-			*buf = ' ';
-		++buf;
-	}
-
-	return buf;
+  char c,sign,tmp[66];
+  const char *digits;
+  const char *small_digits = "0123456789abcdefghijklmnopqrstuvwxyz";
+  const char *large_digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+  int i;
+
+  digits = (type & LARGE) ? large_digits : small_digits;
+  if (type & LEFT)
+    type &= ~ZEROPAD;
+  if (base < 2 || base > 36)
+    return 0;
+  c = (type & ZEROPAD) ? '0' : ' ';
+  sign = 0;
+  if (type & SIGN) {
+    if (num < 0) {
+      sign = '-';
+      num = -num;
+      size--;
+    } else if (type & PLUS) {
+      sign = '+';
+      size--;
+    } else if (type & SPACE) {
+      sign = ' ';
+      size--;
+    }
+  }
+
+  if ((type & SPECIAL) && ((type & REMOVEHEX) == 0)) {
+    if (base == 16)
+      size -= 2;
+  }
+  i = 0;
+  if ((num == 0) && (precision !=0))
+    tmp[i++] = '0';
+  else while (num != 0)
+    tmp[i++] = digits[do_div(&num,base)];
+  if (i > precision)
+    precision = i;
+  size -= precision;
+  if (!(type&(ZEROPAD+LEFT))) {
+    while(size-->0) {
+      if (buf <= end)
+        *buf = ' ';
+      ++buf;
+    }
+  }
+  if (sign) {
+    if (buf <= end)
+      *buf = sign;
+    ++buf;
+  }
+
+  if ((type & SPECIAL) && ((type & REMOVEHEX) == 0)) {
+    if (base==16) {
+      if (buf <= end)
+        *buf = '0';
+      ++buf;
+      if (buf <= end)
+        *buf = digits[33];
+      ++buf;
+    }
+  }
+
+  if (!(type & LEFT)) {
+    while (size-- > 0) {
+      if (buf <= end)
+        *buf = c;
+      ++buf;
+    }
+  }
+  while (i < precision--) {
+    if (buf <= end)
+      *buf = '0';
+    ++buf;
+  }
+  while (i-- > 0) {
+    if (buf <= end)
+      *buf = tmp[i];
+    ++buf;
+  }
+  while (size-- > 0) {
+    if (buf <= end)
+      *buf = ' ';
+    ++buf;
+  }
+
+  return buf;
 }
 
 typedef struct {
-	unsigned int mantissal:32;
-	unsigned int mantissah:20;
-	unsigned int exponent:11;
-	unsigned int sign:1;
+  unsigned int mantissal:32;
+  unsigned int mantissah:20;
+  unsigned int exponent:11;
+  unsigned int sign:1;
 } ieee_double_t;
 
 static __inline void fracrnd(double *number, int prec)
 {
-    /* Shifts fractional digits to decimal places and compares to round table */
-    /* Only suitable to determine the exponent with more precision, not for normal
rounding */
-    /* Incoming numbers are expected to range from approx -10.0 to 10.0 */
-    int lpos = 1, ubound, sign = 1;
-    long decimal = abs((long)*number);
-    double frac = (*number - decimal) * 10;
-    long rt[] = 
-    {
-        0,
-        9,
-        99,
-        999,
-        9999,
-        99999,
-        999999,
-        9999999,
-        99999999,
-        999999999
-    };
-
-    if (*number < 0) 
-    {
-        sign = -1;
-    }
-    ubound = min(prec, sizeof(rt)/sizeof(*rt) - 1);
-    while ((long)frac % 10 != 0 && lpos < ubound)
-    {
-            frac *= 10;
-            lpos++;
-    }
-    if (abs((long)frac) == rt[lpos])
-    {
-        *number = sign * (decimal + 1);
-    }
+  /* Shifts fractional digits to decimal places and compares to round table */
+  /* Only suitable to determine the exponent with more precision, not for normal rounding
*/
+  /* Incoming numbers are expected to range from approx -10.0 to 10.0 */
+  int lpos = 1, ubound, sign = 1;
+  long decimal = abs((long)*number);
+  double frac = (*number - decimal) * 10;
+  long rt[] = 
+  {
+    0,
+    9,
+    99,
+    999,
+    9999,
+    99999,
+    999999,
+    9999999,
+    99999999,
+    999999999
+  };
+
+  if (*number < 0) 
+  {
+    sign = -1;
+  }
+  ubound = min(prec, sizeof(rt)/sizeof(*rt) - 1);
+  while ((long)frac % 10 != 0 && lpos < ubound)
+  {
+    frac *= 10;
+    lpos++;
+  }
+  if (abs((long)frac) == rt[lpos])
+  {
+    *number = sign * (decimal + 1);
+  }
 }
 
 static char *
 numberf(char * buf, char * end, double num, char exp_sign, int size, int precision, int
type)
 {
-	double exponent = 0.0;
-	double e = 0.0;
-	long ie;
-
-	int i = 0;
-	int j = 0;
-	int ro = 0;
-	int isize;
-
-	double num2, frac, intr;
-	double p;
-
-	char c, sign, digits[66];
-	char *tmp;
-
-	union
-	{
-		double*  __n;
-		ieee_double_t*  n;
-	} n;
-
-	n.__n = &num;
-
-	if ( exp_sign == 'g' || exp_sign == 'G' || exp_sign == 'e' ||
exp_sign == 'E' )
-	{
-		ie = ((unsigned int)n.n->exponent - (unsigned int)0x3ff);
-		if (num != 0.0)
-		{
-			exponent = ie/3.321928;
-		}
-	}
-
-	if ( exp_sign == 'g' || exp_sign == 'G' )
-	{
-		type |= ZEROTRUNC;
-		if ( exponent < -4 || fabs(exponent) >= precision )
-			exp_sign -= 2; // g -> e and G -> E
-		else
-			exp_sign = 'f';
-		if (type & SPECIAL) precision--;
-	}
-
-	if ( exp_sign == 'e' ||  exp_sign == 'E' )
-	{
-        if (num != 0.0)
-        {
-            /* Find a suitable exponent */
-            frac = modf(exponent, &e);
-            num2 = num/pow(10.0L, (long double)e);
-            /* Check if rounding is possible */
-            fracrnd(&num2, precision);
-            if (num2 < 1.0 && num2 > -1.0)
-            {
-                e--;
-            }
-            else if (num2 <= -10.0 || num2 >= 10.0)
-            {
-                e++;
-            }
-        }
-
-		/* size-5 because "e+abc" is going to follow */
-		buf = numberf(buf, end, num/pow(10.0L,(long double)e), 'f', size-5, precision,
type);
-		isize = 4;
-		while(*(buf-1) == ' ')
-		{
-			isize++;
-			--buf;
-		}
-
-		if (buf <= end)
-			*buf = exp_sign;
-		++buf;
-		size--;
-
-		ie = (long)e;
-		type = LEFT | SIGN | PLUS;
-		buf = number(buf, end, ie, 10, isize, 3, type);
-		return buf;
-	}
-
-	if ( exp_sign == 'f' )
-	{
-		if (type & LEFT)
-			type &= ~ZEROPAD;
-
-		c = (type & ZEROPAD) ? '0' : ' ';
-		sign = 0;
-
-		if (num < 0)
-		{
-			sign = '-';
-			num = fabs(num);
-			size--;
-		}
-			else if (type & PLUS)
-		{
-			sign = '+';
-			size--;
-		}
-		else if (type & SPACE)
-		{
-			sign = ' ';
-			size--;
-		}
-
-		frac = modf(num,&intr);
-
-		// # flags forces a . and prevents truncation of trailing zero's
-		if ( precision > 0 )
-		{
-			i = precision-1;
-			while ( i >= 0  )
-			{
-				frac*=10.0L;
-				frac = modf(frac, &p);
-				digits[i] = (int)p + '0';
-				i--;
-			}
-
-			i = precision;
-			size -= precision;
-		} 
-
-		if ( precision >= 1 || type & SPECIAL)
-		{
-			digits[i++] = '.';
-			size--;
-		}
-
-		ro = 0;
-		if ( frac > 0.5 )
-		{
-			ro = 1;
-		}
-
-		if ( intr == 0.0 )
-		{
-			digits[i++] = '0';
-			size--;
-		}
-		else
-		{
-			while ( intr > 0.0 )
-			{
-				p = intr;
-				intr/=10.0L;
-				modf(intr, &intr);
-
-				p -= 10.0*intr;
-
-				digits[i++] = (int)p + '0';
-				size--;
-			}
-		}
-
-		j = 0;
-		while ( j < i && ro == 1)
-		{
-			if ( digits[j] >= '0' && digits[j] <= '8' )
-			{
-				digits[j]++;
-				ro = 0;
-			}
-			else if ( digits[j] == '9' )
-			{
-				digits[j] = '0';
-			}
-			j++;
-		}
-		if ( ro == 1 )
-			digits[i++] = '1';
-
-		digits[i] = 0;
-
-		if (!(type & (ZEROPAD+LEFT)))
-		{
-			while(size-->0)
-			{
-				if (buf <= end)
-					*buf = ' ';
-				++buf;
-			}
-		}
-		if (sign)
-		{
-			if (buf <= end)
-				*buf = sign;
-			++buf;
-		}
-
-		if (!(type & (ZEROPAD+LEFT)))
-		{
-			while(size-->0)
-			{
-				if (buf <= end)
-					*buf = ' ';
-				++buf;
-			}
-		}
-
-		if (!(type & LEFT))
-		{
-			while (size-- > 0)
-			{
-				if (buf <= end)
-					*buf = c;
-				++buf;
-			}
-		}
-
-		tmp = digits;
-		if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) )
-		{
-			j = 0;
-			while ( j < i && ( *tmp == '0' || *tmp == '.' ))
-			{
-				tmp++;
-				i--;
-			}
-		}
-		while (i-- > 0)
-		{
-			if (buf <= end)
-				*buf = tmp[i];
-			++buf;
-		}
-		while (size-- > 0)
-		{
-			if (buf <= end)
-				*buf = ' ';
-			buf++;
-		}	
-	}
-	return buf;
+  double exponent = 0.0;
+  double e = 0.0;
+  long ie;
+
+  int i = 0;
+  int j = 0;
+  int ro = 0;
+  int isize;
+
+  double num2, frac, intr;
+  double p;
+
+  char c, sign, digits[66];
+  char *tmp;
+
+  union
+  {
+    double*  __n;
+    ieee_double_t*  n;
+  } n;
+
+  n.__n = &num;
+
+  if ( exp_sign == 'g' || exp_sign == 'G' || exp_sign == 'e' ||
exp_sign == 'E' )
+  {
+    ie = ((unsigned int)n.n->exponent - (unsigned int)0x3ff);
+    if (num != 0.0)
+    {
+      exponent = ie/3.321928;
+    }
+  }
+
+  if ( exp_sign == 'g' || exp_sign == 'G' )
+  {
+    type |= ZEROTRUNC;
+    if ( exponent < -4 || fabs(exponent) >= precision )
+      exp_sign -= 2; // g -> e and G -> E
+    else
+      exp_sign = 'f';
+    if (type & SPECIAL) precision--;
+  }
+
+  if ( exp_sign == 'e' ||  exp_sign == 'E' )
+  {
+    if (num != 0.0)
+    {
+      /* Find a suitable exponent */
+      frac = modf(exponent, &e);
+      num2 = num/pow(10.0L, (long double)e);
+      /* Check if rounding is possible */
+      fracrnd(&num2, precision);
+      if (num2 < 1.0 && num2 > -1.0)
+      {
+        e--;
+      }
+      else if (num2 <= -10.0 || num2 >= 10.0)
+      {
+        e++;
+      }
+    }
+
+    /* size-5 because "e+abc" is going to follow */
+    buf = numberf(buf, end, num/pow(10.0L,(long double)e), 'f', size-5,
precision, type);
+    isize = 4;
+    while(*(buf-1) == ' ')
+    {
+      isize++;
+      --buf;
+    }
+
+    if (buf <= end)
+      *buf = exp_sign;
+    ++buf;
+    size--;
+
+    ie = (long)e;
+    type = LEFT | SIGN | PLUS;
+    buf = number(buf, end, ie, 10, isize, 3, type);
+    return buf;
+  }
+
+  if ( exp_sign == 'f' )
+  {
+    if (type & LEFT)
+      type &= ~ZEROPAD;
+
+    c = (type & ZEROPAD) ? '0' : ' ';
+    sign = 0;
+
+    if (num < 0)
+    {
+      sign = '-';
+      num = fabs(num);
+      size--;
+    }
+    else if (type & PLUS)
+    {
+      sign = '+';
+      size--;
+    }
+    else if (type & SPACE)
+    {
+      sign = ' ';
+      size--;
+    }
+
+    frac = modf(num,&intr);
+
+    // # flags forces a . and prevents truncation of trailing zero's
+    if ( precision > 0 )
+    {
+      i = precision-1;
+      while ( i >= 0  )
+      {
+        frac*=10.0L;
+        frac = modf(frac, &p);
+        digits[i] = (int)p + '0';
+        i--;
+      }
+
+      i = precision;
+      size -= precision;
+    } 
+
+    if ( precision >= 1 || type & SPECIAL)
+    {
+      digits[i++] = '.';
+      size--;
+    }
+
+    ro = 0;
+    if ( frac > 0.5 )
+    {
+      ro = 1;
+    }
+
+    if ( intr == 0.0 )
+    {
+      digits[i++] = '0';
+      size--;
+    }
+    else
+    {
+      while ( intr > 0.0 )
+      {
+        p = intr;
+        intr/=10.0L;
+        modf(intr, &intr);
+
+        p -= 10.0*intr;
+
+        digits[i++] = (int)p + '0';
+        size--;
+      }
+    }
+
+    j = 0;
+    while ( j < i && ro == 1)
+    {
+      if ( digits[j] >= '0' && digits[j] <= '8' )
+      {
+        digits[j]++;
+        ro = 0;
+      }
+      else if ( digits[j] == '9' )
+      {
+        digits[j] = '0';
+      }
+      j++;
+    }
+    if ( ro == 1 )
+      digits[i++] = '1';
+
+    digits[i] = 0;
+
+    if (!(type & (ZEROPAD+LEFT)))
+    {
+      while(size-->0)
+      {
+        if (buf <= end)
+          *buf = ' ';
+        ++buf;
+      }
+    }
+    if (sign)
+    {
+      if (buf <= end)
+        *buf = sign;
+      ++buf;
+    }
+
+    if (!(type & (ZEROPAD+LEFT)))
+    {
+      while(size-->0)
+      {
+        if (buf <= end)
+          *buf = ' ';
+        ++buf;
+      }
+    }
+
+    if (!(type & LEFT))
+    {
+      while (size-- > 0)
+      {
+        if (buf <= end)
+          *buf = c;
+        ++buf;
+      }
+    }
+
+    tmp = digits;
+    if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) )
+    {
+      j = 0;
+      while ( j < i && ( *tmp == '0' || *tmp == '.' ))
+      {
+        tmp++;
+        i--;
+      }
+    }
+    while (i-- > 0)
+    {
+      if (buf <= end)
+        *buf = tmp[i];
+      ++buf;
+    }
+    while (size-- > 0)
+    {
+      if (buf <= end)
+        *buf = ' ';
+      buf++;
+    }
+  }
+  return buf;
 }
 
 static char*
 string(char* buf, char* end, const char* s, int len, int field_width, int precision, int
flags)
 {
-	int i;
-    char c;
-
-    c = (flags & ZEROPAD) ? '0' : ' ';
-
-	if (s == NULL)
-	{
-		s = "<NULL>";
-		len = 6;
-	}
-	else
-	{
-		if (len == -1)
-		{
-			len = 0;
-			while ((unsigned int)len < (unsigned int)precision && s[len])
-				len++;
-		}
-		else
-		{
-			if ((unsigned int)len > (unsigned int)precision)
-				len = precision;
-		}
-	}
-	if (!(flags & LEFT))
-		while (len < field_width--)
-		{
-			if (buf <= end)
-				*buf = c;
-			++buf;
-		}
-	for (i = 0; i < len; ++i)
-	{
-		if (buf <= end)
-			*buf = *s++;
-		++buf;
-	}
-	while (len < field_width--)
-	{
-		if (buf <= end)
-			*buf = ' ';
-		++buf;
-	}
-	return buf;
+  int i;
+  char c;
+
+  c = (flags & ZEROPAD) ? '0' : ' ';
+
+  if (s == NULL)
+  {
+    s = "<NULL>";
+    len = 6;
+  }
+  else
+  {
+    if (len == -1)
+    {
+      len = 0;
+      while ((unsigned int)len < (unsigned int)precision && s[len])
+        len++;
+    }
+    else
+    {
+      if ((unsigned int)len > (unsigned int)precision)
+        len = precision;
+    }
+  }
+  if (!(flags & LEFT))
+    while (len < field_width--)
+    {
+      if (buf <= end)
+        *buf = c;
+      ++buf;
+    }
+  for (i = 0; i < len; ++i)
+  {
+    if (buf <= end)
+      *buf = *s++;
+    ++buf;
+  }
+  while (len < field_width--)
+  {
+    if (buf <= end)
+      *buf = ' ';
+    ++buf;
+  }
+  return buf;
 }
 
 static char*
 stringw(char* buf, char* end, const wchar_t* sw, int len, int field_width, int precision,
int flags)
 {
-	int i;
-	char c;
-
-    c = (flags & ZEROPAD) ? '0' : ' ';
-
-	if (sw == NULL)
-	{
-		sw = L"<NULL>";
-		len = 6;
-	}
-	else
-	{
-		if (len == -1)
-		{
-			len = 0;
-			while ((unsigned int)len < (unsigned int)precision && sw[len])
-				len++;
-		}
-		else
-		{
-			if ((unsigned int)len > (unsigned int)precision)
-				len = precision;
-		}
-	}
-	if (!(flags & LEFT))
-		while (len < field_width--)
-		{
-			if (buf <= end)
-				*buf = c;
-			buf++;
-		}
-	for (i = 0; i < len; ++i)
-	{
-		if (buf <= end)
-			*buf = (unsigned char)(*sw++);
-		buf++;
-	}
-	while (len < field_width--)
-	{
-		if (buf <= end)
-			*buf = ' ';
-		buf++;
-	}
-	return buf;
+  int i;
+  char c;
+
+  c = (flags & ZEROPAD) ? '0' : ' ';
+
+  if (sw == NULL)
+  {
+    sw = L"<NULL>";
+    len = 6;
+  }
+  else
+  {
+    if (len == -1)
+    {
+      len = 0;
+      while ((unsigned int)len < (unsigned int)precision && sw[len])
+        len++;
+    }
+    else
+    {
+      if ((unsigned int)len > (unsigned int)precision)
+        len = precision;
+    }
+  }
+  if (!(flags & LEFT))
+    while (len < field_width--)
+    {
+      if (buf <= end)
+        *buf = c;
+      buf++;
+    }
+  for (i = 0; i < len; ++i)
+  {
+    if (buf <= end)
+      *buf = (unsigned char)(*sw++);
+    buf++;
+  }
+  while (len < field_width--)
+  {
+    if (buf <= end)
+      *buf = ' ';
+    buf++;
+  }
+  return buf;
 }
 
 /*
@@ -533,313 +532,311 @@
  */
 int __cdecl lnx_vsnprintf(char *buf, size_t cnt, const char *fmt, va_list args)
 {
-	int len;
-	unsigned long long num;
-	double _double;
-
-	int base;
-	char *str, *end;
-	const char *s;
-	const wchar_t *sw;
-
-	int flags;		/* flags to number() */
-
-	int field_width;	/* width of output field */
-	int precision;		/* min. # of digits for integers; max
-				   number of chars for from string */
-	int qualifier;		/* 'h', 'l', 'L', 'I' or 'w' for
integer fields */
-
-	str = buf;
-	end = buf + cnt - 1;
-	if (end < buf - 1) {
-		end = ((char *) -1);
-		cnt = end - buf + 1;
-	}
-
-	for ( ; *fmt ; ++fmt) {
-		if (*fmt != '%') {
-			if (str <= end)
-				*str = *fmt;
-			++str;
-			continue;
-		}
-
-		/* process flags */
-		flags = 0;
-		repeat:
-			++fmt;		/* this also skips first '%' */
-			switch (*fmt) {
-				case '-': flags |= LEFT; goto repeat;
-				case '+': flags |= PLUS; goto repeat;
-				case ' ': flags |= SPACE; goto repeat;
-				case '#': flags |= SPECIAL; goto repeat;
-				case '0': flags |= ZEROPAD; goto repeat;
-			}
-
-		/* get field width */
-		field_width = -1;
-		if (isdigit(*fmt))
-			field_width = skip_atoi(&fmt);
-		else if (*fmt == '*') {
-			++fmt;
-			/* it's the next argument */
-			field_width = va_arg(args, int);
-			if (field_width < 0) {
-				field_width = -field_width;
-				flags |= LEFT;
-			}
-		}
-
-		/* get the precision */
-		precision = -1;
-		if (*fmt == '.') {
-			++fmt;
-			if (isdigit(*fmt))
-				precision = skip_atoi(&fmt);
-			else if (*fmt == '*') {
-				++fmt;
-				/* it's the next argument */
-				precision = va_arg(args, int);
-			}
-			if (precision < 0)
-				precision = 0;
-		}
-
-		/* get the conversion qualifier */
-		qualifier = -1;
-		if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || *fmt ==
'w') {
-			qualifier = *fmt;
-			++fmt;
-		} else if (*fmt == 'I' && *(fmt+1) == '6' && *(fmt+2)
== '4') {
-			qualifier = *fmt;
-			fmt += 3;
-		} else if (*fmt == 'I' && *(fmt+1) == '3' && *(fmt+2)
== '2') {
-			qualifier = 'l';
-			fmt += 3;
-		} else if (*fmt == 'F' && *(fmt+1) == 'p') {
-			fmt += 1;
-            flags |= REMOVEHEX;
+  int len;
+  unsigned long long num;
+  double _double;
+
+  int base;
+  char *str, *end;
+  const char *s;
+  const wchar_t *sw;
+
+  int flags;  /* flags to number() */
+
+  int field_width;  /* width of output field */
+  int precision;    /* min. # of digits for integers; max
+                    number of chars for from string */
+  int qualifier;    /* 'h', 'l', 'L', 'I' or 'w'
for integer fields */
+
+  str = buf;
+  end = buf + cnt - 1;
+  if (end < buf - 1) {
+    end = ((char *) -1);
+    cnt = end - buf + 1;
+  }
+
+  for ( ; *fmt ; ++fmt) {
+    if (*fmt != '%') {
+      if (str <= end)
+        *str = *fmt;
+      ++str;
+      continue;
+    }
+
+    /* process flags */
+    flags = 0;
+repeat:
+    ++fmt;  /* this also skips first '%' */
+    switch (*fmt) {
+        case '-': flags |= LEFT; goto repeat;
+        case '+': flags |= PLUS; goto repeat;
+        case ' ': flags |= SPACE; goto repeat;
+        case '#': flags |= SPECIAL; goto repeat;
+        case '0': flags |= ZEROPAD; goto repeat;
+    }
+
+    /* get field width */
+    field_width = -1;
+    if (isdigit(*fmt))
+      field_width = skip_atoi(&fmt);
+    else if (*fmt == '*') {
+      ++fmt;
+      /* it's the next argument */
+      field_width = va_arg(args, int);
+      if (field_width < 0) {
+        field_width = -field_width;
+        flags |= LEFT;
+      }
+    }
+
+    /* get the precision */
+    precision = -1;
+    if (*fmt == '.') {
+      ++fmt;
+      if (isdigit(*fmt))
+        precision = skip_atoi(&fmt);
+      else if (*fmt == '*') {
+        ++fmt;
+        /* it's the next argument */
+        precision = va_arg(args, int);
+      }
+      if (precision < 0)
+        precision = 0;
+    }
+
+    /* get the conversion qualifier */
+    qualifier = -1;
+    if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || *fmt ==
'w') {
+      qualifier = *fmt;
+      ++fmt;
+    } else if (*fmt == 'I' && *(fmt+1) == '6' && *(fmt+2)
== '4') {
+      qualifier = *fmt;
+      fmt += 3;
+    } else if (*fmt == 'I' && *(fmt+1) == '3' && *(fmt+2)
== '2') {
+      qualifier = 'l';
+      fmt += 3;
+    } else if (*fmt == 'F' && *(fmt+1) == 'p') {
+      fmt += 1;
+      flags |= REMOVEHEX;
+    }
+
+    /* default base */
+    base = 10;
+
+    switch (*fmt) {
+      case 'c': /* finished */
+        if (qualifier == 'l' || qualifier == 'w') {
+          wchar_t sw1[2];
+          /* print unicode string */
+          sw1[0] = (wchar_t) va_arg(args, int);
+          sw1[1] = 0;
+          str = stringw(str, end, (wchar_t *)&sw1, -1, field_width, precision,
flags);
+        } else {
+          char s1[2];
+          /* print ascii string */
+          s1[0] = ( unsigned char) va_arg(args, int);
+          s1[1] = 0;
+          str = string(str, end, (char *)&s1, -1,  field_width, precision, flags);
         }
-
-		/* default base */
-		base = 10;
-
-		switch (*fmt) {
-		case 'c': /* finished */
-             if (qualifier == 'l' || qualifier == 'w') {
-	              wchar_t sw1[2];
-				/* print unicode string */
-                sw1[0] = (wchar_t) va_arg(args, int);
-                sw1[1] = 0;
-				str = stringw(str, end, (wchar_t *)&sw1, -1, field_width, precision, flags);
-			} else {
-                char s1[2];
-				/* print ascii string */
-                s1[0] = ( unsigned char) va_arg(args, int);
-                s1[1] = 0;
-				str = string(str, end, (char *)&s1, -1,  field_width, precision, flags);
-			}
-            continue;
-
-		case 'C': /* finished */
-			if (!(flags & LEFT))
-				while (--field_width > 0) {
-					if (str <= end)
-						*str = ' ';
-					++str;
-				}
-			if (qualifier == 'h') {
-				if (str <= end)
-					*str = (unsigned char) va_arg(args, int);
-				++str;
-			} else {
-				if (str <= end)
-					*str = (unsigned char)(wchar_t) va_arg(args, int);
-				++str;
-			}
-			while (--field_width > 0) {
-				if (str <= end)
-					*str = ' ';
-				++str;
-			}
-			continue;
-
-		case 's': /* finished */
-			if (qualifier == 'l' || qualifier == 'w') {
-				/* print unicode string */
-				sw = va_arg(args, wchar_t *);
-				str = stringw(str, end, sw, -1, field_width, precision, flags);
-			} else {
-				/* print ascii string */
-				s = va_arg(args, char *);
-				str = string(str, end, s, -1,  field_width, precision, flags);
-			}
-			continue;
-
-		case 'S':
-			if (qualifier == 'h') {
-				/* print ascii string */
-				s = va_arg(args, char *);
-				str = string(str, end, s, -1,  field_width, precision, flags);
-			} else {
-				/* print unicode string */
-				sw = va_arg(args, wchar_t *);
-				str = stringw(str, end, sw, -1, field_width, precision, flags);
-			}
-			continue;
-
-		case 'Z':
-			if (qualifier == 'w') {
-				/* print counted unicode string */
-				PUNICODE_STRING pus = va_arg(args, PUNICODE_STRING);
-				if ((pus == NULL) || (pus->Buffer == NULL)) {
-					sw = NULL;
-					len = -1;
-				} else {
-					sw = pus->Buffer;
-					len = pus->Length / sizeof(WCHAR);
-				}
-				str = stringw(str, end, sw, len,  field_width, precision, flags);
-			} else {
-				/* print counted ascii string */
-				PANSI_STRING pus = va_arg(args, PANSI_STRING);
-				if ((pus == NULL) || (pus->Buffer == NULL)) {
-					s = NULL;
-					len = -1;
-				} else {
-					s = pus->Buffer;
-					len = pus->Length;
-				}
-				str = string(str, end, s, len,  field_width, precision, flags);
-			}
-			continue;
-
-		case 'p':
-            if ((flags & LARGE) == 0)
-                flags |= LARGE;
-
-			if (field_width == -1) {
-				field_width = 2 * sizeof(void *);
-				flags |= ZEROPAD;
-			}
-			str = number(str, end,
-				(uintptr_t) va_arg(args, void *), 16,
-				field_width, precision, flags);
-			continue;
-
-		case 'n':
-			/* FIXME: What does C99 say about the overflow case here? */
-			if (qualifier == 'l') {
-				long * ip = va_arg(args, long *);
-				*ip = (str - buf);
-			} else {
-				int * ip = va_arg(args, int *);
-				*ip = (str - buf);
-			}
-			continue;
-
-		/* float number formats - set up the flags and "break" */
-        case 'e':
-		case 'E':
-		case 'f':
-		case 'g':
-		case 'G':
-          _double = (double)va_arg(args, double);
-         if ( _isnan(_double) ) {
-            s = "Nan";
-            len = 3;
-            while ( len > 0 ) {
-               if (str <= end)
-					*str = *s++;
-				++str;
-               len --;
-            }
-         } else if ( _isinf(_double) < 0 ) {
-            s = "-Inf";
-            len = 4;
-            while ( len > 0 ) {
-              	if (str <= end)
-					*str = *s++;
-				++str;
-               len --;
-            }
-         } else if ( _isinf(_double) > 0 ) {
-            s = "+Inf";
-            len = 4;
-            while ( len > 0 ) {
-               if (str <= end)
-					*str = *s++;
-				++str;
-               len --;
-            }
-         } else {
-            if ( precision == -1 )
-               precision = 6;
-               	str = numberf(str, end, _double, *fmt, field_width, precision, flags);
-         }
-
+        continue;
+
+      case 'C': /* finished */
+        if (!(flags & LEFT))
+          while (--field_width > 0) {
+            if (str <= end)
+              *str = ' ';
+            ++str;
+          }
+          if (qualifier == 'h') {
+            if (str <= end)
+              *str = (unsigned char) va_arg(args, int);
+            ++str;
+          } else {
+            if (str <= end)
+              *str = (unsigned char)(wchar_t) va_arg(args, int);
+            ++str;
+          }
+          while (--field_width > 0) {
+            if (str <= end)
+              *str = ' ';
+            ++str;
+          }
           continue;
 
-
-		/* integer number formats - set up the flags and "break" */
-		case 'o':
-			base = 8;
-			break;
-
-		case 'b':
-			base = 2;
-			break;
-
-		case 'X':
-			flags |= LARGE;
-		case 'x':
-			base = 16;
-			break;
-
-		case 'd':
-		case 'i':
-			flags |= SIGN;
-		case 'u':
-			break;
-
-		default:
-			if (*fmt) {
-				if (str <= end)
-					*str = *fmt;
-				++str;
-			} else
-				--fmt;
-			continue;
-		}
-
-		if (qualifier == 'I')
-			num = va_arg(args, unsigned long long);
-		else if (qualifier == 'l') {
-			if (flags & SIGN)
-				num = va_arg(args, long);
-			else
-				num = va_arg(args, unsigned long);
-		}
-		else if (qualifier == 'h') {
-			if (flags & SIGN)
-				num = va_arg(args, int);
-			else
-				num = va_arg(args, unsigned int);
-		}
-		else {
-			if (flags & SIGN)
-				num = va_arg(args, int);
-			else
-				num = va_arg(args, unsigned int);
-		}
-		str = number(str, end, num, base, field_width, precision, flags);
-	}
-	if (str <= end)
-		*str = '\0';
-	else if (cnt > 0)
-		/* don't write out a null byte if the buf size is zero */
-		*end = '\0';
-	return str-buf;
+      case 's': /* finished */
+        if (qualifier == 'l' || qualifier == 'w') {
+          /* print unicode string */
+          sw = va_arg(args, wchar_t *);
+          str = stringw(str, end, sw, -1, field_width, precision, flags);
+        } else {
+          /* print ascii string */
+          s = va_arg(args, char *);
+          str = string(str, end, s, -1,  field_width, precision, flags);
+        }
+        continue;
+
+      case 'S':
+        if (qualifier == 'h') {
+          /* print ascii string */
+          s = va_arg(args, char *);
+          str = string(str, end, s, -1,  field_width, precision, flags);
+        } else {
+          /* print unicode string */
+          sw = va_arg(args, wchar_t *);
+          str = stringw(str, end, sw, -1, field_width, precision, flags);
+        }
+        continue;
+
+      case 'Z':
+        if (qualifier == 'w') {
+          /* print counted unicode string */
+          PUNICODE_STRING pus = va_arg(args, PUNICODE_STRING);
+          if ((pus == NULL) || (pus->Buffer == NULL)) {
+            sw = NULL;
+            len = -1;
+          } else {
+            sw = pus->Buffer;
+            len = pus->Length / sizeof(WCHAR);
+          }
+          str = stringw(str, end, sw, len,  field_width, precision, flags);
+        } else {
+          /* print counted ascii string */
+          PANSI_STRING pus = va_arg(args, PANSI_STRING);
+          if ((pus == NULL) || (pus->Buffer == NULL)) {
+            s = NULL;
+            len = -1;
+          } else {
+            s = pus->Buffer;
+            len = pus->Length;
+          }
+          str = string(str, end, s, len,  field_width, precision, flags);
+        }
+        continue;
+
+      case 'p':
+        if ((flags & LARGE) == 0)
+            flags |= LARGE;
+
+        if (field_width == -1) {
+          field_width = 2 * sizeof(void *);
+          flags |= ZEROPAD;
+        }
+        str = number(str, end,
+          (uintptr_t) va_arg(args, void *), 16,
+          field_width, precision, flags);
+        continue;
+
+      case 'n':
+        /* FIXME: What does C99 say about the overflow case here? */
+        if (qualifier == 'l') {
+          long * ip = va_arg(args, long *);
+          *ip = (str - buf);
+        } else {
+          int * ip = va_arg(args, int *);
+          *ip = (str - buf);
+        }
+        continue;
+
+      /* float number formats - set up the flags and "break" */
+      case 'e':
+      case 'E':
+      case 'f':
+      case 'g':
+      case 'G':
+        _double = (double)va_arg(args, double);
+        if ( _isnan(_double) ) {
+          s = "Nan";
+          len = 3;
+          while ( len > 0 ) {
+             if (str <= end)
+               *str = *s++;
+             ++str;
+             len --;
+          }
+       } else if ( _isinf(_double) < 0 ) {
+          s = "-Inf";
+          len = 4;
+          while ( len > 0 ) {
+             if (str <= end)
+                *str = *s++;
+              ++str;
+             len --;
+          }
+       } else if ( _isinf(_double) > 0 ) {
+          s = "+Inf";
+          len = 4;
+          while ( len > 0 ) {
+             if (str <= end)
+               *str = *s++;
+             ++str;
+             len --;
+          }
+       } else {
+          if ( precision == -1 )
+             precision = 6;
+             str = numberf(str, end, _double, *fmt, field_width, precision, flags);
+       }
+        continue;
+
+      /* integer number formats - set up the flags and "break" */
+      case 'o':
+        base = 8;
+        break;
+
+      case 'b':
+        base = 2;
+        break;
+
+      case 'X':
+        flags |= LARGE;
+      case 'x':
+        base = 16;
+        break;
+
+      case 'd':
+      case 'i':
+        flags |= SIGN;
+      case 'u':
+        break;
+
+      default:
+        if (*fmt) {
+          if (str <= end)
+            *str = *fmt;
+          ++str;
+        } else
+          --fmt;
+        continue;
+    }
+
+    if (qualifier == 'I')
+      num = va_arg(args, unsigned long long);
+    else if (qualifier == 'l') {
+      if (flags & SIGN)
+        num = va_arg(args, long);
+      else
+        num = va_arg(args, unsigned long);
+    }
+    else if (qualifier == 'h') {
+      if (flags & SIGN)
+        num = va_arg(args, int);
+      else
+        num = va_arg(args, unsigned int);
+    }
+    else {
+      if (flags & SIGN)
+        num = va_arg(args, int);
+      else
+        num = va_arg(args, unsigned int);
+    }
+    str = number(str, end, num, base, field_width, precision, flags);
+  }
+  if (str <= end)
+    *str = '\0';
+  else if (cnt > 0)
+    /* don't write out a null byte if the buf size is zero */
+    *end = '\0';
+  return str-buf;
 }
 
 
@@ -848,13 +845,13 @@
  */
 int lnx_sprintf(char * buf, const char *fmt, ...)
 {
-	va_list args;
-	int i;
-
-	va_start(args, fmt);
-	i=lnx_vsnprintf(buf,MAXLONG,fmt,args);
-	va_end(args);
-	return i;
+  va_list args;
+  int i;
+
+  va_start(args, fmt);
+  i=lnx_vsnprintf(buf,MAXLONG,fmt,args);
+  va_end(args);
+  return i;
 }
 
 #if 0
@@ -863,13 +860,13 @@
  */
 int _snprintf(char * buf, size_t cnt, const char *fmt, ...)
 {
-	va_list args;
-	int i;
-
-	va_start(args, fmt);
-	i=_vsnprintf(buf,cnt,fmt,args);
-	va_end(args);
-	return i;
+  va_list args;
+  int i;
+
+  va_start(args, fmt);
+  i=_vsnprintf(buf,cnt,fmt,args);
+  va_end(args);
+  return i;
 }
 
 
@@ -878,7 +875,7 @@
  */
 int __cdecl vsprintf(char *buf, const char *fmt, va_list args)
 {
-	return _vsnprintf(buf,MAXLONG,fmt,args);
+  return _vsnprintf(buf,MAXLONG,fmt,args);
 }
 #endif
 /* EOF */