X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flibpspp%2Fstr.h;h=aaf83d71a448fcb9e429a165d92fa617ffbfd8fc;hb=8e7e8e7e1c3b098700428f2b75b1b4080ab9faf0;hp=66552a396486133a7642366152f7d98b72151bf1;hpb=c1a772dd16c825866b0b1b4cfa5c1ba57a9fa48f;p=pspp

diff --git a/src/libpspp/str.h b/src/libpspp/str.h
index 66552a3964..aaf83d71a4 100644
--- a/src/libpspp/str.h
+++ b/src/libpspp/str.h
@@ -29,9 +29,13 @@
 #include "memcasecmp.h"
 #include "xstrndup.h"
 #include "xvasprintf.h"
+
+#include "gl/xalloc.h"
 
 /* Miscellaneous. */
 
+struct substring;
+
 void buf_reverse (char *, size_t);
 int buf_compare_case (const char *, const char *, size_t);
 int buf_compare_rpad (const char *, size_t, const char *, size_t);
@@ -50,6 +54,10 @@ void str_lowercase (char *);
 bool str_format_26adic (unsigned long int number, bool uppercase,
                         char buffer[], size_t);
 
+void str_ellipsize (struct substring in, char *out, size_t out_size);
+
+static inline char *xstrdup_if_nonnull (const char *);
+
 void *mempset (void *, int, size_t);
 
 /* Common character classes for use with substring and string functions. */
@@ -95,6 +103,7 @@ void ss_dealloc (struct substring *);
 /* Mutators.
    Functions that advance the beginning of a string should not be
    used if a substring is to be deallocated. */
+void ss_swap (struct substring *, struct substring *);
 void ss_truncate (struct substring *, size_t);
 size_t ss_rtrim (struct substring *, struct substring trim_set);
 size_t ss_ltrim (struct substring *, struct substring trim_set);
@@ -141,6 +150,8 @@ int ss_first_mblen (struct substring);
 ucs4_t ss_get_mb (struct substring *);
 ucs4_t ss_at_mb (struct substring, size_t ofs);
 int ss_at_mblen (struct substring, size_t ofs);
+size_t ss_utf8_count_columns (struct substring);
+struct substring ss_utf8_columns (struct substring, size_t start, size_t n);
 
 /* Variable length strings. */
 
@@ -281,4 +292,10 @@ ss_buffer (const char *buffer, size_t cnt)
   return ss;
 }
 
+static inline char *
+xstrdup_if_nonnull (const char *s)
+{
+  return s ? xstrdup (s) : NULL;
+}
+
 #endif /* str_h */