Changeset 390 for trunk/src

Timestamp:

May 30, 2011, 5:44:18 PM (14 years ago)

Author:

pr

Message:

Add nlsThousandsLong to fix signed/unsigned display error.

Location:

trunk/src

Files:

• cppbase/bs_string_base.cpp (modified) (3 diffs)
• helpers/nls.c (modified) (2 diffs)

trunk/src/cppbase/bs_string_base.cpp

@@ -8 +8 @@
 
 /*
- *      This file Copyright (C) 1999-2001 Ulrich M”ller.
+ *      This file Copyright (C) 1999-2011 Ulrich M”ller.
  *      This program is free software; you can redistribute it and/or modify
  *      it under the terms of the GNU General Public License as published by
@@ -374 +374 @@
  *
  *@@added V0.9.18 (2002-03-08) [umoeller]
+ *@@changed WarpIN V1.0.20 (2011-05-30) [pr]: fix signed/unsigned error
  */
 
@@ -383 +384 @@
     CHAR sz[100];
     if (cThousands)
-        nlsThousandsULong(sz, value, cThousands);
+        nlsThousandsLong(sz, value, cThousands);
     else
         _itoa(value, sz, 10);

trunk/src/helpers/nls.c

@@ -22 +22 @@
 
 /*
- *      Copyright (C) 1997-2010 Ulrich M”ller.
+ *      Copyright (C) 1997-2011 Ulrich M”ller.
  *      This file is part of the "XWorkplace helpers" source package.
  *      This is free software; you can redistribute it and/or modify
@@ -762 +762 @@
 
 /*
+ *@@ nlsThousandsLong:
+ *      signed version of above.
+ *
+ *@@added WarpIn V1.0.20 (2011-05-30) [pr]
+ */
+
+PSZ nlsThousandsLong(PSZ pszTarget,       // out: decimal as string
+                     LONG l,              // in: decimal to convert
+                     CHAR cThousands)     // in: separator char (e.g. '.')
+{
+    CHAR    szTemp[30];
+    USHORT  ust = 0,
+            uss,
+            usLen = sprintf(szTemp, "%ld", l);
+
+    for (uss = 0;
+         uss < usLen;
+         uss++)
+    {
+        if (uss)
+            if (((usLen - uss) % 3) == 0)
+            {
+                pszTarget[ust] = cThousands;
+                ust++;
+            }
+
+        pszTarget[ust++] = szTemp[uss];
+    }
+
+    pszTarget[ust] = '\0';
+
+    return pszTarget;
+}
+
+/*
  *@@ nlsThousandsDouble:
  *      like nlsThousandsULong, but for a "double"