X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fstr.h;h=dd41ede819a04c27cc15407167f7f4106fa8bbc0;hb=92c31025565a5b5c270c83b0208ab46a90e9b64b;hp=7c3ef3d5f9ed5ffd89ff4c339e49e66fa9464073;hpb=14b360304396965ef0ed26f639e5b07e2766d23e;p=pspp

diff --git a/src/libpspp/str.h b/src/libpspp/str.h
index 7c3ef3d5f9..dd41ede819 100644
--- a/src/libpspp/str.h
+++ b/src/libpspp/str.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2009, 2010, 2011, 2012, 2014 Free Software Foundation, Inc.
 
    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
@@ -47,7 +47,8 @@ void str_copy_buf_trunc (char *, size_t, const char *, size_t);
 void str_uppercase (char *);
 void str_lowercase (char *);
 
-bool str_format_26adic (unsigned long int number, char buffer[], size_t);
+bool str_format_26adic (unsigned long int number, bool uppercase,
+                        char buffer[], size_t);
 
 void *mempset (void *, int, size_t);
 
@@ -223,12 +224,19 @@ bool ds_read_stream (struct string *, size_t size, size_t cnt, FILE *stream);
 /* Append. */
 void ds_put_byte (struct string *, int ch);
 void ds_put_byte_multiple (struct string *, int ch, size_t);
+void ds_put_unichar (struct string *, ucs4_t uc);
 void ds_put_cstr (struct string *, const char *);
 void ds_put_substring (struct string *, struct substring);
 void ds_put_vformat (struct string *st, const char *, va_list)
      PRINTF_FORMAT (2, 0);
+void ds_put_c_vformat (struct string *st, const char *, va_list)
+     PRINTF_FORMAT (2, 0);
+
 void ds_put_format (struct string *, const char *, ...)
      PRINTF_FORMAT (2, 3);
+void ds_put_c_format (struct string *, const char *, ...)
+     PRINTF_FORMAT (2, 3);
+
 char *ds_put_uninit (struct string *st, size_t incr);
 
 char *ds_splice_uninit (struct string *, size_t ofs, size_t old_len,
@@ -243,7 +251,7 @@ void u8_buf_copy_rpad (uint8_t *dst, size_t dst_size,
 		       const uint8_t *src, size_t src_size,
 		       char pad);
 
-struct substring
+static inline struct substring
 ss_empty (void)
 {
   struct substring ss;