X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fstr.h;h=ff00b3593356580bd3a2888a1d2c26ebaec4c217;hb=b1f538f35e5c6cc682550642147ca6ac10174116;hp=23966dfd0f4c90b37abd9ff5127b697554cffb16;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp-builds.git diff --git a/src/libpspp/str.h b/src/libpspp/str.h index 23966dfd..ff00b359 100644 --- a/src/libpspp/str.h +++ b/src/libpspp/str.h @@ -25,6 +25,7 @@ #include "compiler.h" #include "memcasecmp.h" +#include "xstrndup.h" #include "xvasprintf.h" /* Miscellaneous. */ @@ -45,6 +46,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); @@ -102,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 *); @@ -199,9 +203,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);