X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fstr.h;h=ca990dbc3632f8b4d4f0870cf8874f595be44163;hb=1064fc2fd4d0e07672ca60145c8c11926576e41b;hp=50671d90c5133bc481ddad49ba400bbe8cde8b2c;hpb=c725a4f64718ef1ee4139c27c94b2eb6447b51b4;p=pspp-builds.git diff --git a/src/libpspp/str.h b/src/libpspp/str.h index 50671d90..ca990dbc 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 Free Software Foundation, Inc. + 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 @@ -105,6 +105,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 *); @@ -202,7 +203,7 @@ 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 *); bool ds_read_stream (struct string *, size_t size, size_t cnt, FILE *stream); @@ -217,4 +218,8 @@ 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); + #endif /* str_h */