X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fstr.h;h=7917d58a70dd3a62e305ff84c6884aa85e7061cb;hb=c94be33beb7085e1cbb1ec47f0e3a49c896d443b;hp=306bd8ba89f110762dbf31f04abace081227b0cc;hpb=6f3865480503c571963d8a2d1af858a4d72d4e88;p=pspp

diff --git a/src/libpspp/str.h b/src/libpspp/str.h
index 306bd8ba89..7917d58a70 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, 2012 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
@@ -29,6 +29,8 @@
 #include "memcasecmp.h"
 #include "xstrndup.h"
 #include "xvasprintf.h"
+
+#include "gl/xalloc.h"
 
 /* Miscellaneous. */
 
@@ -47,7 +49,10 @@ 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);
+
+static inline char *xstrdup_if_nonnull (const char *);
 
 void *mempset (void *, int, size_t);
 
@@ -121,10 +126,12 @@ char *ss_end (struct substring);
 int ss_at (struct substring, size_t idx);
 int ss_first (struct substring);
 int ss_last (struct substring);
+bool ss_starts_with (struct substring, struct substring prefix);
 bool ss_ends_with (struct substring, struct substring suffix);
 size_t ss_span (struct substring, struct substring skip_set);
 size_t ss_cspan (struct substring, struct substring stop_set);
 size_t ss_find_byte (struct substring, char);
+size_t ss_find_substring (struct substring, struct substring);
 int ss_compare (struct substring, struct substring);
 int ss_compare_case (struct substring, struct substring);
 int ss_equals (struct substring, struct substring);
@@ -278,4 +285,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 */