From: VMware, Inc <>
Date: Tue, 26 Apr 2011 21:08:19 +0000 (-0700)
Subject: lib/string: more cleanup
X-Git-Tag: 2011.04.25-402641~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23516ebca243135ba5811e4ecac5b02657d2586b;p=thirdparty%2Fopen-vm-tools.git

lib/string: more cleanup

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/lib/string/bsd_vsnprintf.c b/open-vm-tools/lib/string/bsd_vsnprintf.c
index 3ec581903..76b8f4dce 100644
--- a/open-vm-tools/lib/string/bsd_vsnprintf.c
+++ b/open-vm-tools/lib/string/bsd_vsnprintf.c
@@ -665,8 +665,9 @@ bsd_vsnprintf_core(char **outbuf,
          PRINT(cp, n);
          ret += n;
       }
-      if (ch == '\0')
+      if (ch == '\0') {
          goto done;
+      }
       fmt++;      /* skip over '%' */
 
       flags = 0;
@@ -684,8 +685,10 @@ bsd_vsnprintf_core(char **outbuf,
           * flag will be ignored.''
           *   -- ANSI X3J11
           */
-         if (!sign)
+
+         if (!sign) {
             sign = ' ';
+         }
          goto rflag;
       case '#':
          flags |= ALT;
@@ -698,8 +701,9 @@ bsd_vsnprintf_core(char **outbuf,
           * They don't exclude field widths read from args.
           */
          GETASTER (width);
-         if (width >= 0)
+         if (width >= 0) {
             goto rflag;
+         }
          width = -width;
          /* FALLTHROUGH */
       case '-':
@@ -851,10 +855,11 @@ bsd_vsnprintf_core(char **outbuf,
       case 'e':
       case 'E':
          expchar = ch;
-         if (prec < 0)   /* account for digit before decpt */
+         if (prec < 0) {  /* account for digit before decpt */
             prec = DEFPREC + 1;
-         else
+         } else {
             prec++;
+         }
          goto fp_begin;
       case 'f':
       case 'F':
@@ -863,8 +868,9 @@ bsd_vsnprintf_core(char **outbuf,
       case 'g':
       case 'G':
          expchar = ch - ('g' - 'e');
-         if (prec == 0)
+         if (prec == 0) {
             prec = 1;
+         }
       fp_begin:
          if (prec < 0) {
             prec = DEFPREC;