Switch back to using Util_snprintf() which has been fixed now.

git-svn-id: http://svn.cactuscode.org/arrangements/CactusConnect/HTTPDExtra/trunk@64 61ea717e-8e0c-4c3c-b38e-e9c67f54f1f1

1 files changed, 4 insertions, 19 deletions

diff --git a/src/TimerInfo.c b/src/TimerInfo.c
index 5d3d10c..dd7bfa5 100644
--- a/src/TimerInfo.c
+++ b/src/TimerInfo.c
@@ -145,7 +145,6 @@ static int TimerInfoPage(const cGH *cctkGH, httpRequest *request, void *data)
   int ntimers = 0, nt = 0;
   int nclocks = 0, nc = 0;
   int i, j;
-  char *sdata;
   char *sbuff;
   String *message = String_New();
   cTimerData *tdata;
@@ -291,26 +290,19 @@ static int TimerInfoPage(const cGH *cctkGH, httpRequest *request, void *data)
               ConcatDecimal(message, tdata->vals[nc].val.l);
               break;
             case val_double:
-              /* printf("res(%s): %f\n", CCTK_TimerName(nt), tdata->vals[nc].resolution); */
-              /* ConcatDouble doesn't work correctly, cuts 0.0002 to 0.2 */
-              /* ConcatDouble(message, tdata->vals[nc].val.d); */
-              sdata = (char*) malloc(DECBUFSIZE);
-              snprintf(sdata, DECBUFSIZE, "%f", tdata->vals[nc].val.d);
-
               /** if the new value is different from the old one
                * (changed) print it in bold characters
                */
               if ( TI_oldtimes[nc][nt] != tdata->vals[nc].val.d )
               {
                 ConcatCString(message, "<span style=\"font-weight:bold\">");
-                ConcatCString(message, sdata);
+                ConcatDouble(message, tdata->vals[nc].val.d);
                 ConcatCString(message, "</span>");
               }
               else
               {
-                ConcatCString(message, sdata);
+                ConcatDouble(message, tdata->vals[nc].val.d);
               }
-              free(sdata);
               /* old value = new value */
               TI_oldtimes[nc][nt]=tdata->vals[nc].val.d;
               break;
@@ -411,26 +403,19 @@ static int TimerInfoPage(const cGH *cctkGH, httpRequest *request, void *data)
               ConcatDecimal(message, tdata->vals[nc].val.l);
               break;
             case val_double:
-              /* ConcatDouble doesn't work correctly, cuts 0.0002 to 0.2 */
-              /* ConcatDouble(message, tdata->vals[nc].val.d); */
-
-              sdata = (char*) malloc(DECBUFSIZE);
-              snprintf(sdata, DECBUFSIZE, "%f", tdata->vals[nc].val.d);
-
               /** if the new value is different from the old one
                * (changed) print it in bold characters
                 */
               if ( TI_oldtimes[nc][nt] != tdata->vals[nc].val.d )
               {
                 ConcatCString(message, "<span style=\"font-weight:bold\">");
-                ConcatCString(message, sdata);
+                ConcatDouble(message, tdata->vals[nc].val.d);
                 ConcatCString(message, "</span>");
               }
               else
               {
-                ConcatCString(message, sdata);
+                ConcatDouble(message, tdata->vals[nc].val.d);
               }
-              free(sdata);
               /* old value = new value */
                  TI_oldtimes[nc][nt]=tdata->vals[nc].val.d;