From be6696cba3f2075272c382fd6a99d36ea787ca61 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Fri, 29 May 2009 15:10:36 -0700
Subject: [PATCH] Run Nindent on memdump/printf.c

Automatically reformat memdump/printf.c using Nindent.

Do this for all files except HDT, gPXE and externally maintained
libraries (zlib, tinyjpeg, libpng).

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---
 memdump/printf.c | 481 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 246 insertions(+), 235 deletions(-)

diff --git a/memdump/printf.c b/memdump/printf.c
index 99b389f..4bef266 100644
--- a/memdump/printf.c
+++ b/memdump/printf.c
@@ -17,12 +17,13 @@
 
 static int strnlen(const char *s, int maxlen)
 {
-  const char *es = s;
-  while ( *es && maxlen ) {
-    es++; maxlen--;
-  }
+    const char *es = s;
+    while (*es && maxlen) {
+	es++;
+	maxlen--;
+    }
 
-  return (es-s);
+    return (es - s);
 }
 
 #define ZEROPAD	1		/* pad with zero */
@@ -39,259 +40,269 @@ __res = ((unsigned long) n) % (unsigned) base; \
 n = ((unsigned long) n) / (unsigned) base; \
 __res; })
 
-static char * number(char * str, long num, int base, int size, int precision
-	,int type)
+static char *number(char *str, long num, int base, int size, int precision,
+		    int type)
 {
-  char c,sign,tmp[66];
-  const char *digits="0123456789abcdefghijklmnopqrstuvwxyz";
-  int i;
-
-  if (type & LARGE)
-    digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-  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--;
+    char c, sign, tmp[66];
+    const char *digits = "0123456789abcdefghijklmnopqrstuvwxyz";
+    int i;
+
+    if (type & LARGE)
+	digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+    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) {
+	if (base == 16)
+	    size -= 2;
+	else if (base == 8)
+	    size--;
     }
-  }
-  if (type & SPECIAL) {
-    if (base == 16)
-      size -= 2;
-    else if (base == 8)
-      size--;
-  }
-  i = 0;
-  if (num == 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)
-      *str++ = ' ';
-  if (sign)
-    *str++ = sign;
-  if (type & SPECIAL) {
-    if (base==8)
-      *str++ = '0';
-    else if (base==16) {
-      *str++ = '0';
-      *str++ = digits[33];
+    i = 0;
+    if (num == 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)
+	    *str++ = ' ';
+    if (sign)
+	*str++ = sign;
+    if (type & SPECIAL) {
+	if (base == 8)
+	    *str++ = '0';
+	else if (base == 16) {
+	    *str++ = '0';
+	    *str++ = digits[33];
+	}
     }
-  }
-  if (!(type & LEFT))
+    if (!(type & LEFT))
+	while (size-- > 0)
+	    *str++ = c;
+    while (i < precision--)
+	*str++ = '0';
+    while (i-- > 0)
+	*str++ = tmp[i];
     while (size-- > 0)
-      *str++ = c;
-  while (i < precision--)
-    *str++ = '0';
-  while (i-- > 0)
-    *str++ = tmp[i];
-  while (size-- > 0)
-    *str++ = ' ';
-  return str;
+	*str++ = ' ';
+    return str;
 }
 
 /* Forward decl. needed for IP address printing stuff... */
-int sprintf(char * buf, const char *fmt, ...);
+int sprintf(char *buf, const char *fmt, ...);
 
 int vsprintf(char *buf, const char *fmt, va_list args)
 {
-  int len;
-  unsigned long num;
-  int i, base;
-  char * str;
-  const char *s;
+    int len;
+    unsigned long num;
+    int i, base;
+    char *str;
+    const char *s;
 
-  int flags;		/* flags to number() */
+    int flags;			/* flags to number() */
 
-  int field_width;	/* width of output field */
-  int precision;		/* min. # of digits for integers; max
+    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', or 'L' for integer fields */
-
-  for (str=buf ; *fmt ; ++fmt) {
-    if (*fmt != '%') {
-      *str++ = *fmt;
-      continue;
+    int qualifier;		/* 'h', 'l', or 'L' for integer fields */
+
+    for (str = buf; *fmt; ++fmt) {
+	if (*fmt != '%') {
+	    *str++ = *fmt;
+	    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_atou(&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_atou(&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') {
+	    qualifier = *fmt;
+	    ++fmt;
+	}
+
+	/* default base */
+	base = 10;
+
+	switch (*fmt) {
+	case 'c':
+	    if (!(flags & LEFT))
+		while (--field_width > 0)
+		    *str++ = ' ';
+	    *str++ = (unsigned char)va_arg(args, int);
+	    while (--field_width > 0)
+		*str++ = ' ';
+	    continue;
+
+	case 's':
+	    s = va_arg(args, char *);
+	    len = strnlen(s, precision);
+
+	    if (!(flags & LEFT))
+		while (len < field_width--)
+		    *str++ = ' ';
+	    for (i = 0; i < len; ++i)
+		*str++ = *s++;
+	    while (len < field_width--)
+		*str++ = ' ';
+	    continue;
+
+	case 'p':
+	    if (field_width == -1) {
+		field_width = 2 * sizeof(void *);
+		flags |= ZEROPAD;
+	    }
+	    str = number(str,
+			 (unsigned long)va_arg(args, void *), 16,
+			 field_width, precision, flags);
+	    continue;
+
+	case 'n':
+	    if (qualifier == 'l') {
+		long *ip = va_arg(args, long *);
+		*ip = (str - buf);
+	    } else {
+		int *ip = va_arg(args, int *);
+		*ip = (str - buf);
+	    }
+	    continue;
+
+	case '%':
+	    *str++ = '%';
+	    continue;
+
+	    /* integer number formats - set up the flags and "break" */
+	case 'o':
+	    base = 8;
+	    break;
+
+	case 'X':
+	    flags |= LARGE;
+	case 'x':
+	    base = 16;
+	    break;
+
+	case 'd':
+	case 'i':
+	    flags |= SIGN;
+	case 'u':
+	    break;
+
+	default:
+	    *str++ = '%';
+	    if (*fmt)
+		*str++ = *fmt;
+	    else
+		--fmt;
+	    continue;
+	}
+	if (qualifier == 'l')
+	    num = va_arg(args, unsigned long);
+	else if (qualifier == 'h') {
+	    num = (unsigned short)va_arg(args, int);
+	    if (flags & SIGN)
+		num = (short)num;
+	} else if (flags & SIGN)
+	    num = va_arg(args, int);
+	else
+	    num = va_arg(args, unsigned int);
+	str = number(str, num, base, field_width, precision, flags);
     }
-
-    /* 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_atou(&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_atou(&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') {
-      qualifier = *fmt;
-      ++fmt;
-    }
-
-    /* default base */
-    base = 10;
-
-    switch (*fmt) {
-    case 'c':
-      if (!(flags & LEFT))
-	while (--field_width > 0)
-	  *str++ = ' ';
-      *str++ = (unsigned char) va_arg(args, int);
-      while (--field_width > 0)
-	*str++ = ' ';
-      continue;
-
-    case 's':
-      s = va_arg(args, char *);
-      len = strnlen(s, precision);
-
-      if (!(flags & LEFT))
-	while (len < field_width--)
-	  *str++ = ' ';
-      for (i = 0; i < len; ++i)
-	*str++ = *s++;
-      while (len < field_width--)
-	*str++ = ' ';
-      continue;
-
-    case 'p':
-      if (field_width == -1) {
-	field_width = 2*sizeof(void *);
-	flags |= ZEROPAD;
-      }
-      str = number(str,
-		   (unsigned long) va_arg(args, void *), 16,
-		   field_width, precision, flags);
-      continue;
-
-
-    case 'n':
-      if (qualifier == 'l') {
-	long * ip = va_arg(args, long *);
-	*ip = (str - buf);
-      } else {
-	int * ip = va_arg(args, int *);
-	*ip = (str - buf);
-      }
-      continue;
-
-    case '%':
-      *str++ = '%';
-      continue;
-
-      /* integer number formats - set up the flags and "break" */
-    case 'o':
-      base = 8;
-      break;
-
-    case 'X':
-      flags |= LARGE;
-    case 'x':
-      base = 16;
-      break;
-
-    case 'd':
-    case 'i':
-      flags |= SIGN;
-    case 'u':
-      break;
-
-    default:
-      *str++ = '%';
-      if (*fmt)
-	*str++ = *fmt;
-      else
-	--fmt;
-      continue;
-    }
-    if (qualifier == 'l')
-      num = va_arg(args, unsigned long);
-    else if (qualifier == 'h') {
-      num = (unsigned short) va_arg(args, int);
-      if (flags & SIGN)
-	num = (short) num;
-    } else if (flags & SIGN)
-      num = va_arg(args, int);
-    else
-      num = va_arg(args, unsigned int);
-    str = number(str, num, base, field_width, precision, flags);
-  }
-  *str = '\0';
-  return str-buf;
+    *str = '\0';
+    return str - buf;
 }
 
-int sprintf(char * buf, const char *fmt, ...)
+int sprintf(char *buf, const char *fmt, ...)
 {
-  va_list args;
-  int i;
+    va_list args;
+    int i;
 
-  va_start(args, fmt);
-  i=vsprintf(buf,fmt,args);
-  va_end(args);
-  return i;
+    va_start(args, fmt);
+    i = vsprintf(buf, fmt, args);
+    va_end(args);
+    return i;
 }
 
 int printf(const char *fmt, ...)
 {
-  char printf_buf[1024];
-  va_list args;
-  int printed;
+    char printf_buf[1024];
+    va_list args;
+    int printed;
 
-  va_start(args, fmt);
-  printed = vsprintf(printf_buf, fmt, args);
-  va_end(args);
+    va_start(args, fmt);
+    printed = vsprintf(printf_buf, fmt, args);
+    va_end(args);
 
-  puts(printf_buf);
+    puts(printf_buf);
 
-  return printed;
+    return printed;
 }
-- 
2.7.4