X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fstr.h;h=861d9a8024a0d9647dda7e32a48422239d83b2e3;hb=d807ad29cc0d3caa4f0e04ee4b75c70a225cfeaf;hp=9b90cf60f93695e4e6715b2b0d82e782905f3ab4;hpb=d2ec80c72483254a876b0bb86882224248110c0c;p=pspp-builds.git diff --git a/src/str.h b/src/str.h index 9b90cf60..861d9a80 100644 --- a/src/str.h +++ b/src/str.h @@ -127,49 +127,49 @@ void st_bare_pad_copy (char *dest, const char *src, size_t n); void st_bare_pad_len_copy (char *dest, const char *src, size_t n, size_t len); void st_pad_copy (char *dest, const char *src, size_t n); -/* Lengthed strings. */ -struct len_string +/* Fixed-length strings. */ +struct fixed_string { char *string; size_t length; }; -void ls_create (struct len_string *, const char *); -void ls_create_buffer (struct len_string *, +void ls_create (struct fixed_string *, const char *); +void ls_create_buffer (struct fixed_string *, const char *, size_t len); -void ls_init (struct len_string *, const char *, size_t); -void ls_shallow_copy (struct len_string *, const struct len_string *); -void ls_destroy (struct len_string *); +void ls_init (struct fixed_string *, const char *, size_t); +void ls_shallow_copy (struct fixed_string *, const struct fixed_string *); +void ls_destroy (struct fixed_string *); -void ls_null (struct len_string *); -int ls_null_p (const struct len_string *); -int ls_empty_p (const struct len_string *); +void ls_null (struct fixed_string *); +int ls_null_p (const struct fixed_string *); +int ls_empty_p (const struct fixed_string *); -size_t ls_length (const struct len_string *); -char *ls_c_str (const struct len_string *); -char *ls_end (const struct len_string *); +size_t ls_length (const struct fixed_string *); +char *ls_c_str (const struct fixed_string *); +char *ls_end (const struct fixed_string *); #if __GNUC__ > 1 extern inline size_t -ls_length (const struct len_string *st) +ls_length (const struct fixed_string *st) { return st->length; } extern inline char * -ls_c_str (const struct len_string *st) +ls_c_str (const struct fixed_string *st) { return st->string; } extern inline char * -ls_end (const struct len_string *st) +ls_end (const struct fixed_string *st) { return st->string + st->length; } #endif -/* Dynamic strings. */ +/* Variable length strings. */ struct string {