From: VMware, Inc <>
Date: Tue, 29 Mar 2011 18:40:27 +0000 (-0700)
Subject: lib/string: simple cleanup
X-Git-Tag: 2011.03.28-387002~100
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f11a7b56d3cf8088765e175e87e84bc960c7afe6;p=thirdparty%2Fopen-vm-tools.git

lib/string: simple cleanup

Trivial cleanup before a change.

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 b6210640f..7ffb4502c 100644
--- a/open-vm-tools/lib/string/bsd_vsnprintf.c
+++ b/open-vm-tools/lib/string/bsd_vsnprintf.c
@@ -589,15 +589,15 @@ bsd_vsnprintf(char **outbuf, size_t bufSize, const char *fmt0, va_list ap)
    convbuf = NULL;
 #ifndef NO_FLOATING_POINT
    dtoaresult = NULL;
-#if !defined __ANDROID__
-   decimal_point = localeconv()->decimal_point;
-#else
+#if defined(__ANDROID__)
    /*
     * Struct lconv is not working! For decimal_point,
     * using '.' instead is a workaround.
     */
    NOT_TESTED();
    decimal_point = &dp;
+#else
+   decimal_point = localeconv()->decimal_point;
 #endif
 #endif
 
@@ -714,15 +714,15 @@ bsd_vsnprintf(char **outbuf, size_t bufSize, const char *fmt0, va_list ap)
          goto rflag;
       case '\'':
          flags |= GROUPING;
-#if !defined __ANDROID__
-         thousands_sep = *(localeconv()->thousands_sep);
-         grouping = localeconv()->grouping;
-#else
+#if defined(__ANDROID__)
          /*
           * Struct lconv is not working! The code below is a workaround.
           */
          NOT_TESTED();
          thousands_sep = ',';
+#else
+         thousands_sep = *(localeconv()->thousands_sep);
+         grouping = localeconv()->grouping;
 #endif
 	 /*
 	  * Grouping should not begin with 0, but it nevertheless