Removed nsprintf(), nvsprintf().

Moved spprintf() definition into str.c.

diff --git a/src/language/dictionary/sys-file-info.c b/src/language/dictionary/sys-file-info.c
index 13c3275e035093a5c2c7be31bd1fc479f3d2c3a6..5c3985be68c06c5fe8aca0377ba6e3863fb80aad 100644 (file)
--- a/src/language/dictionary/sys-file-info.c
+++ b/src/language/dictionary/sys-file-info.c
@@ -482,11 +482,11 @@ describe_variable (struct variable *v, struct tab_table *t, int r, int as)
           double x, y;
           mv_pop_range (&mv, &x, &y);
           if (x == LOWEST)
-            cp += nsprintf (cp, "LOWEST THRU %g", y);
+            cp += sprintf (cp, "LOWEST THRU %g", y);
           else if (y == HIGHEST)
-            cp += nsprintf (cp, "%g THRU HIGHEST", x);
+            cp += sprintf (cp, "%g THRU HIGHEST", x);
           else
-            cp += nsprintf (cp, "%g THRU %g", x, y);
+            cp += sprintf (cp, "%g THRU %g", x, y);
           cnt++;
         }
       while (mv_has_value (&mv)) 
@@ -494,9 +494,9 @@ describe_variable (struct variable *v, struct tab_table *t, int r, int as)
           union value value;
           mv_pop_value (&mv, &value);
           if (cnt++ > 0)
-            cp += nsprintf (cp, "; ");
+            cp += sprintf (cp, "; ");
           if (v->type == NUMERIC)
-            cp += nsprintf (cp, "%g", value.f);
+            cp += sprintf (cp, "%g", value.f);
           else 
             {
               *cp++ = '"';

diff --git a/src/libpspp/ChangeLog b/src/libpspp/ChangeLog
index 305561195f927169b7bf9926a050ea3097954250..befea2038341fdfcb74be613da8027f6e4e12d28 100644 (file)
--- a/src/libpspp/ChangeLog
+++ b/src/libpspp/ChangeLog
@@ -1,3 +1,12 @@
+Sun May 14 22:06:53 2006  Ben Pfaff  <blp@gnu.org>
+
+       * str.c (spprintf): Moved definition of spprintf() here, from
+       str.h.
+
+       * str.h: (nsprintf) Removed.  Changed all users to use sprintf()
+       instead.
+       (nvsprintf) Removed.  Changed all users to use vsprintf() instead.
+
 Sun May 14 20:52:20 2006  Ben Pfaff  <blp@gnu.org>
 
        * str.c (ds_init): Remove `capacity' argument and just initialize

diff --git a/src/libpspp/str.c b/src/libpspp/str.c
index ef2be7d068479ee023b484386a9d53d537d30407..655774d63d57c8e1b9b146b9d513edc8abe2a387 100644 (file)
--- a/src/libpspp/str.c
+++ b/src/libpspp/str.c
@@ -236,6 +236,21 @@ str_lowercase (char *s)
   for (; *s != '\0'; s++)
     *s = tolower ((unsigned char) *s);
 }
+
+/* Formats FORMAT into DST, as with sprintf(), and returns the
+   address of the terminating null written to DST. */
+char *
+spprintf (char *dst, const char *format, ...) 
+{
+  va_list args;
+  int count;
+
+  va_start (args, format);
+  count = vsprintf (dst, format, args);
+  va_end (args);
+
+  return dst + count;
+}
 \f
 /* Initializes ST with initial contents S. */
 void

diff --git a/src/libpspp/str.h b/src/libpspp/str.h
index 379762fc858e5db6171ace675007055b12b009e1..cd7cdb05ad754f7d2cc9697e8c0dcad322519b8d 100644 (file)
--- a/src/libpspp/str.h
+++ b/src/libpspp/str.h
@@ -61,6 +61,8 @@ void str_copy_trunc (char *, size_t, const char *);
 void str_copy_buf_trunc (char *, size_t, const char *, size_t);
 void str_uppercase (char *);
 void str_lowercase (char *);
+
+char *spprintf (char *dst, const char *format, ...);
 \f
 /* Fixed-length strings. */
 struct fixed_string 
@@ -173,6 +175,7 @@ void ds_concat (struct string *, const char *, size_t);
 void ds_vprintf (struct string *st, const char *, va_list);
 void ds_printf (struct string *, const char *, ...)
      PRINTF_FORMAT (2, 3);
+char *ds_append_uninit (struct string *st, size_t incr);
 
 #if __GNUC__ > 1
 extern inline void
@@ -202,27 +205,4 @@ ds_end (const struct string *st)
 }
 #endif
 
-#define nsprintf sprintf
-#define nvsprintf vsprintf
-
-/* Formats FORMAT into DST, as with sprintf(), and returns the
-   address of the terminating null written to DST. */
-static inline char *
-spprintf (char *dst, const char *format, ...) 
-{
-  va_list args;
-  int count;
-
-  va_start (args, format);
-  count = nvsprintf (dst, format, args);
-  va_end (args);
-
-  return dst + count;
-}
-
-
-char * ds_append_uninit(struct string *st, size_t incr);
-
-
-
 #endif /* str_h */