X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fstr.h;h=306bd8ba89f110762dbf31f04abace081227b0cc;hb=5f9212b9af772575bd3026ca9643684ce6493b3c;hp=7c3ef3d5f9ed5ffd89ff4c339e49e66fa9464073;hpb=14b360304396965ef0ed26f639e5b07e2766d23e;p=pspp diff --git a/src/libpspp/str.h b/src/libpspp/str.h index 7c3ef3d5f9..306bd8ba89 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 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 @@ -223,12 +223,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 +250,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;