Changeset 6025

Timestamp:

Jan 16, 2006, 11:23:21 PM (21 years ago)

Author:

magnier

Message:

added psLine, commented out

Location:

branches/eam_rel9_b1/psLib/src/sys

Files:

• psString.c (modified) (3 diffs)
• psString.h (modified) (2 diffs)

branches/eam_rel9_b1/psLib/src/sys/psString.c

@@ -12 +12 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-11-22 19:11:07 $
+ *  @version $Revision: 1.21.6.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-01-17 09:23:21 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -59 +59 @@
 }
 
+// XXX EAM : since 'dest' is on the memory system, this probably should be:
+//   ssize_t psStringAppend(psString *dest, const char *format, ...)
 ssize_t psStringAppend(char **dest, const char *format, ...)
 {
@@ -157 +159 @@
     return length;
 }
+
+/*** psLine not yet released ***/
+# if (0)
+    static void psLineFree (psLine *line)
+{
+
+    if (line == NULL)
+        return;
+
+    psFree (line->line);
+    return;
+}
+
+// allocate a psLine structrue
+psLine *psLineAlloc (int Nline)
+{
+
+    psLine *line;
+    line = psAlloc (sizeof(psLine));
+    psMemSetDeallocator(line, (psFreeFunc) psLineFree);
+
+    line->Nline = 0;
+    line->NLINE = Nline;
+    line->line = psAlloc (Nline);
+    return (line);
+}
+
+bool psLineInit (psLine *line)
+{
+    if (line == NULL)
+        return (false);
+    line->Nline = 0;
+    return (true);
+}
+
+bool psLineAdd (psLine *line, char *format, ...)
+{
+
+    int Nchar;
+    va_list ap;
+
+    if (line == NULL)
+        return (false);
+
+    int nMax = line->NLINE - line->Nline;
+
+    va_start (ap, format);
+    Nchar = vsnprintf (&line->line[line->Nline], nMax, format, ap);
+    line->Nline += PS_MIN (nMax - 1, Nchar);
+    va_end (ap);
+
+    if (Nchar >= nMax)
+        return (false);
+    return (true);
+}
+# endif

branches/eam_rel9_b1/psLib/src/sys/psString.h

@@ -13 +13 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-13 01:09:58 $
+ *  @version $Revision: 1.16.18.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-01-17 09:23:21 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -97 +97 @@
 /** @} */// Doxygen - End of SystemGroup Functions
 
+
+/* psLine not yet released */
+# if (0)
+    // structure to carry a dynamic string
+    typedef struct
+    {
+        int NLINE;
+        int Nline;
+        char *line;
+    }
+psLine;
+
+// psLine functions -- keep out for now?
+psLine      *psLineAlloc (int Nline);
+bool      psLineInit (psLine *line);
+bool      psLineAdd (psLine *line, char *format, ...);
+# endif
+
 #endif // #ifndef PS_STRING_H
+