Changeset 17515 for trunk/psLib/src/math/psPolynomialMetadata.c

Timestamp:

May 4, 2008, 2:09:04 PM (18 years ago)

Author:

eugene

Message:

merging from eam_branch_20080430 : cleanups for tests, minor fixes from tests, reduced verbosity level in some places, add UPDATE and RESET directives to MULTI and METADATA in config files

File:

• trunk/psLib/src/math/psPolynomialMetadata.c (modified) (13 diffs)

trunk/psLib/src/math/psPolynomialMetadata.c

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-10-09 19:25:45 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-05-05 00:09:04 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -25 +25 @@
 #include <stdarg.h>
 #include <string.h>
+#include <ctype.h>
 
 #include "psType.h"
@@ -90 +91 @@
     PS_ASSERT_PTR_NON_NULL(md, false);
     PS_ASSERT_PTR_NON_NULL(poly, false);
+    PS_ASSERT_PTR_NON_NULL(format, false);
+
     //XXX:  Current implementation only supports ordinary polynomials.
     if (poly->type != PS_POLYNOMIAL_ORD)
@@ -99 +102 @@
     va_list argp;
 
-    va_start (argp, format);
-    Nbyte = vsnprintf (&tmp, 0, format, argp);
-    va_end (argp);
-
-    if (Nbyte <= 0)
-        return false;
+    // skip past whitespace (output name should not include whitespace)
+    char *fmt = (char *) format;
+    while (isspace(*fmt)) fmt++;
+
+    va_start (argp, format);
+    Nbyte = vsnprintf (&tmp, 0, fmt, argp);
+    va_end (argp);
+
+    if (Nbyte <= 0) return false;
 
     va_start (argp, format);
     root = (char *) psAlloc (Nbyte + 1);
     memset (root, 0, Nbyte + 1);
-    vsnprintf (root, Nbyte + 1, format, argp);
+    vsnprintf (root, Nbyte + 1, fmt, argp);
     va_end (argp);
 
@@ -203 +209 @@
     PS_ASSERT_PTR_NON_NULL(md, false);
     PS_ASSERT_PTR_NON_NULL(poly, false);
+    PS_ASSERT_PTR_NON_NULL(format, false);
 
     // XXX Current implementation only supports ordinary polynomials.
@@ -213 +220 @@
     va_list argp;
 
-    va_start (argp, format);
-    Nbyte = vsnprintf (&tmp, 0, format, argp);
+    // skip past whitespace (output name should not include whitespace)
+    char *fmt = (char *) format;
+    while (isspace(*fmt)) fmt++;
+
+    va_start (argp, format);
+    Nbyte = vsnprintf (&tmp, 0, fmt, argp);
     va_end (argp);
 
@@ -223 +234 @@
     root = (char *) psAlloc (Nbyte + 1);
     memset (root, 0, Nbyte + 1);
-    vsnprintf (root, Nbyte + 1, format, argp);
+    vsnprintf (root, Nbyte + 1, fmt, argp);
     va_end (argp);
 
@@ -327 +338 @@
     PS_ASSERT_PTR_NON_NULL(md, false);
     PS_ASSERT_PTR_NON_NULL(poly, false);
+    PS_ASSERT_PTR_NON_NULL(format, false);
+
     //XXX:  Current implementation only supports ordinary polynomials.
     if (poly->type != PS_POLYNOMIAL_ORD)
@@ -336 +349 @@
     va_list argp;
 
-    va_start (argp, format);
-    Nbyte = vsnprintf (&tmp, 0, format, argp);
+    // skip past whitespace (output name should not include whitespace)
+    char *fmt = (char *) format;
+    while (isspace(*fmt)) fmt++;
+
+    va_start (argp, format);
+    Nbyte = vsnprintf (&tmp, 0, fmt, argp);
     va_end (argp);
 
@@ -346 +363 @@
     root = (char *) psAlloc (Nbyte + 1);
     memset (root, 0, Nbyte + 1);
-    vsnprintf (root, Nbyte + 1, format, argp);
+    vsnprintf (root, Nbyte + 1, fmt, argp);
     va_end (argp);
 
@@ -461 +478 @@
     PS_ASSERT_PTR_NON_NULL(md, false);
     PS_ASSERT_PTR_NON_NULL(poly, false);
+    PS_ASSERT_PTR_NON_NULL(format, false);
+
     //XXX:  Current implementation only supports ordinary polynomials.
     if (poly->type != PS_POLYNOMIAL_ORD)
@@ -470 +489 @@
     va_list argp;
 
-    va_start (argp, format);
-    Nbyte = vsnprintf (&tmp, 0, format, argp);
+    // skip past whitespace (output name should not include whitespace)
+    char *fmt = (char *) format;
+    while (isspace(*fmt)) fmt++;
+
+    va_start (argp, format);
+    Nbyte = vsnprintf (&tmp, 0, fmt, argp);
     va_end (argp);
 
@@ -480 +503 @@
     root = (char *) psAlloc (Nbyte + 1);
     memset (root, 0, Nbyte + 1);
-    vsnprintf (root, Nbyte + 1, format, argp);
+    vsnprintf (root, Nbyte + 1, fmt, argp);
     va_end (argp);