X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fstr.h;h=ecf9e6eb3fe44cb2fb9658cf539a797433ead671;hb=d8493b3b0617cc447446a70b031a69079bc19002;hp=b9be394c59c46a95f1f593e970ac83e4cdb8d7b8;hpb=c9b92e317e7426db24fce2636134e1e46eb05d40;p=pspp-builds.git diff --git a/src/libpspp/str.h b/src/libpspp/str.h index b9be394c..ecf9e6eb 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 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2009, 2010 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 @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -31,7 +32,6 @@ /* Miscellaneous. */ 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, char pad); @@ -48,8 +48,6 @@ 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); /* Common character classes for use with substring and string functions. */ @@ -74,9 +72,9 @@ struct substring /* Constructors. These functions do not allocate any memory, so the substrings they create should not normally be destroyed. */ -struct substring ss_empty (void); -struct substring ss_cstr (const char *); -struct substring ss_buffer (const char *, size_t); +static inline struct substring ss_empty (void); +static inline struct substring ss_cstr (const char *); +static inline struct substring ss_buffer (const char *, size_t); struct substring ss_substr (struct substring, size_t start, size_t); struct substring ss_head (struct substring, size_t); struct substring ss_tail (struct substring, size_t); @@ -104,11 +102,11 @@ bool ss_separate (struct substring src, struct substring delimiters, 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_byte (struct substring *, char); +int ss_match_byte_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 *); +int ss_get_byte (struct substring *); +size_t ss_get_bytes (struct substring *, size_t cnt, struct substring *); bool ss_get_until (struct substring *, char delimiter, struct substring *); size_t ss_get_long (struct substring *, long *); @@ -122,7 +120,7 @@ int ss_first (struct substring); int ss_last (struct substring); size_t ss_span (struct substring, struct substring skip_set); size_t ss_cspan (struct substring, struct substring stop_set); -size_t ss_find_char (struct substring, char); +size_t ss_find_byte (struct substring, char); int ss_compare (struct substring, struct substring); int ss_compare_case (struct substring, struct substring); int ss_equals (struct substring, struct substring); @@ -195,13 +193,14 @@ int ds_first (const struct string *); int ds_last (const struct string *); size_t ds_span (const struct string *, struct substring skip_set); size_t ds_cspan (const struct string *, struct substring stop_set); -size_t ds_find_char (const struct string *, char); +size_t ds_find_byte (const struct string *, char); int ds_compare (const struct string *, const struct string *); size_t ds_pointer_to_position (const struct string *, const char *); char *ds_xstrdup (const struct string *); size_t ds_capacity (const struct string *); char *ds_cstr (const struct string *); +char *ds_steal_cstr (struct string *); /* File input. */ bool ds_read_line (struct string *, FILE *, size_t max_length); @@ -209,8 +208,8 @@ 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); /* Append. */ -void ds_put_char (struct string *, int ch); -void ds_put_char_multiple (struct string *, int ch, size_t); +void ds_put_byte (struct string *, int ch); +void ds_put_byte_multiple (struct string *, int ch, size_t); void ds_put_cstr (struct string *, const char *); void ds_put_substring (struct string *, struct substring); void ds_put_vformat (struct string *st, const char *, va_list) @@ -223,4 +222,37 @@ char *ds_put_uninit (struct string *st, size_t incr); /* 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); + +struct substring +ss_empty (void) +{ + struct substring ss; + ss.string = NULL; + ss.length = 0; + return ss; +} + +/* Returns a substring whose contents are the given C-style + string CSTR. */ +static inline struct substring +ss_cstr (const char *cstr) +{ + return ss_buffer (cstr, strlen (cstr)); +} + +/* Returns a substring whose contents are the CNT characters in + BUFFER. */ +static inline struct substring +ss_buffer (const char *buffer, size_t cnt) +{ + struct substring ss; + ss.string = (char *) buffer; + ss.length = cnt; + return ss; +} + #endif /* str_h */