X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fstr.h;h=a134079f90dd52f7c359d7ad4fba3049c5c85203;hb=8830c95bb9e8d72621787866141a27fc22e8c786;hp=81cda125726f531dd6ff791385f483627bb395bc;hpb=0fa141762183890ebd139ccd9264f08db9011539;p=pspp-builds.git diff --git a/src/libpspp/str.h b/src/libpspp/str.h index 81cda125..a134079f 100644 --- a/src/libpspp/str.h +++ b/src/libpspp/str.h @@ -1,21 +1,18 @@ -/* PSPP - computes sample statistics. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. - Written by Ben Pfaff . +/* 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 @@ -23,19 +20,13 @@ #include #include #include +#include #include #include #include "compiler.h" #include "memcasecmp.h" -#include "memmem.h" -#include "snprintf.h" -#include "stpcpy.h" -#include "strcase.h" -#include "strftime.h" -#include "strstr.h" -#include "strtok_r.h" -#include "vsnprintf.h" +#include "xstrndup.h" #include "xvasprintf.h" /* Miscellaneous. */ @@ -44,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 *); @@ -56,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); @@ -69,14 +62,15 @@ void *mempset (void *, int, size_t); #define CC_ALNUM CC_LETTERS CC_DIGITS /* Substrings. */ -struct substring +struct substring { char *string; size_t length; }; #define SS_EMPTY_INITIALIZER {NULL, 0} -#define SS_LITERAL_INITIALIZER(LITERAL) {LITERAL, (sizeof LITERAL) - 1} +#define SS_LITERAL_INITIALIZER(LITERAL) \ + {(char *) LITERAL, (sizeof LITERAL) - 1} /* Constructors. These functions do not allocate any memory, so the substrings @@ -90,8 +84,12 @@ struct substring ss_tail (struct substring, size_t); /* Constructors and destructor that allocate and deallocate memory. */ +struct pool; void ss_alloc_substring (struct substring *, struct substring); void ss_alloc_uninit (struct substring *, size_t); +void ss_alloc_substring_pool (struct substring *, struct substring, + struct pool *); +void ss_alloc_uninit_pool (struct substring *, size_t, struct pool *); void ss_dealloc (struct substring *); /* Mutators. @@ -108,6 +106,8 @@ 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 *); bool ss_get_until (struct substring *, char delimiter, struct substring *); @@ -178,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 *); @@ -204,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); @@ -219,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 */