X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fstr.h;h=a134079f90dd52f7c359d7ad4fba3049c5c85203;hb=b5c82cc9aabe7e641011130240ae1b2e84348e23;hp=5a67fc8b556512df5669dd075626624b4a00827f;hpb=50f8d6d2dbf599b410c9bc346a47cb577fba8fe1;p=pspp-builds.git
diff --git a/src/libpspp/str.h b/src/libpspp/str.h
index 5a67fc8b..a134079f 100644
--- a/src/libpspp/str.h
+++ b/src/libpspp/str.h
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 1997-9, 2000, 2009 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see . */
#if !str_h
#define str_h 1
@@ -22,12 +20,13 @@
#include
#include
#include
+#include
#include
#include
#include "compiler.h"
#include "memcasecmp.h"
-#include "vsnprintf.h"
+#include "xstrndup.h"
#include "xvasprintf.h"
/* Miscellaneous. */
@@ -36,10 +35,10 @@ void buf_reverse (char *, size_t);
char *buf_find_reverse (const char *, size_t, const 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);
-void buf_copy_lpad (char *, size_t, const char *, size_t);
-void buf_copy_rpad (char *, size_t, const char *, size_t);
-void buf_copy_str_lpad (char *, size_t, const char *);
-void buf_copy_str_rpad (char *, size_t, const char *);
+void buf_copy_lpad (char *, size_t, const char *, size_t, char pad);
+void buf_copy_rpad (char *, size_t, const char *, size_t, char pad);
+void buf_copy_str_lpad (char *, size_t, const char *, char pad);
+void buf_copy_str_rpad (char *, size_t, const char *, char pad);
int str_compare_rpad (const char *, const char *);
void str_copy_rpad (char *, size_t, const char *);
@@ -48,6 +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);
+
char *spprintf (char *dst, const char *format, ...);
void *mempset (void *, int, size_t);
@@ -61,7 +62,7 @@ void *mempset (void *, int, size_t);
#define CC_ALNUM CC_LETTERS CC_DIGITS
/* Substrings. */
-struct substring
+struct substring
{
char *string;
size_t length;
@@ -105,6 +106,7 @@ bool ss_tokenize (struct substring src, struct substring delimiters,
size_t *save_idx, struct substring *token);
void ss_advance (struct substring *, size_t);
bool ss_match_char (struct substring *, char);
+int ss_match_char_in (struct substring *, struct substring);
bool ss_match_string (struct substring *, const struct substring);
int ss_get_char (struct substring *);
size_t ss_get_chars (struct substring *, size_t cnt, struct substring *);
@@ -176,6 +178,7 @@ bool ds_tokenize (const struct string *src, struct substring delimiters,
size_t *save_idx, struct substring *token);
void ds_rpad (struct string *, size_t length, char pad);
void ds_set_length (struct string *, size_t new_length, char pad);
+void ds_remove (struct string *, size_t start, size_t n);
/* Extracting substrings. */
struct substring ds_ss (const struct string *);
@@ -202,9 +205,9 @@ size_t ds_capacity (const struct string *);
char *ds_cstr (const struct string *);
/* File input. */
-bool ds_read_line (struct string *, FILE *);
+bool ds_read_line (struct string *, FILE *, size_t max_length);
bool ds_read_config_line (struct string *, int *line_number, FILE *);
-size_t ds_read_stream (struct string *, size_t size, size_t cnt, FILE *stream);
+bool ds_read_stream (struct string *, size_t size, size_t cnt, FILE *stream);
/* Append. */
void ds_put_char (struct string *, int ch);
@@ -217,4 +220,14 @@ void ds_put_format (struct string *, const char *, ...)
PRINTF_FORMAT (2, 3);
char *ds_put_uninit (struct string *st, size_t incr);
+/* Other */
+/* calls relocate from gnulib on ST */
+void ds_relocate (struct string *st);
+
+
+void u8_buf_copy_rpad (uint8_t *dst, size_t dst_size,
+ const uint8_t *src, size_t src_size,
+ char pad);
+
+
#endif /* str_h */