projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
str: Rename ss_chomp() to ss_chomp_byte(), ds_chomp() to ds_chomp_byte().
[pspp-builds.git]
/
src
/
libpspp
/
str.h
diff --git
a/src/libpspp/str.h
b/src/libpspp/str.h
index ecf9e6eb3fe44cb2fb9658cf539a797433ead671..d2b39ef50b27c72f8a503e1040ff5dc5421c9ea9 100644
(file)
--- a/
src/libpspp/str.h
+++ b/
src/libpspp/str.h
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2009, 2010
, 2011
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
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
@@
-23,6
+23,7
@@
#include <stdint.h>
#include <stdio.h>
#include <string.h>
#include <stdint.h>
#include <stdio.h>
#include <string.h>
+#include <unitypes.h>
#include "compiler.h"
#include "memcasecmp.h"
#include "compiler.h"
#include "memcasecmp.h"
@@
-84,6
+85,7
@@
struct substring ss_tail (struct substring, size_t);
struct pool;
void ss_alloc_substring (struct substring *, struct substring);
void ss_alloc_uninit (struct substring *, size_t);
struct pool;
void ss_alloc_substring (struct substring *, struct substring);
void ss_alloc_uninit (struct substring *, size_t);
+void ss_realloc (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_alloc_substring_pool (struct substring *, struct substring,
struct pool *);
void ss_alloc_uninit_pool (struct substring *, size_t, struct pool *);
@@
-96,7
+98,7
@@
void ss_truncate (struct substring *, size_t);
size_t ss_rtrim (struct substring *, struct substring trim_set);
size_t ss_ltrim (struct substring *, struct substring trim_set);
void ss_trim (struct substring *, struct substring trim_set);
size_t ss_rtrim (struct substring *, struct substring trim_set);
size_t ss_ltrim (struct substring *, struct substring trim_set);
void ss_trim (struct substring *, struct substring trim_set);
-bool ss_chomp (struct substring *, char);
+bool ss_chomp
_byte
(struct substring *, char);
bool ss_separate (struct substring src, struct substring delimiters,
size_t *save_idx, struct substring *token);
bool ss_tokenize (struct substring src, struct substring delimiters,
bool ss_separate (struct substring src, struct substring delimiters,
size_t *save_idx, struct substring *token);
bool ss_tokenize (struct substring src, struct substring delimiters,
@@
-127,6
+129,13
@@
int ss_equals (struct substring, struct substring);
int ss_equals_case (struct substring, struct substring);
size_t ss_pointer_to_position (struct substring, const char *);
char *ss_xstrdup (struct substring);
int ss_equals_case (struct substring, struct substring);
size_t ss_pointer_to_position (struct substring, const char *);
char *ss_xstrdup (struct substring);
+
+/* UTF-8. */
+ucs4_t ss_first_mb (struct substring);
+int ss_first_mblen (struct substring);
+ucs4_t ss_get_mb (struct substring *);
+ucs4_t ss_at_mb (struct substring, size_t ofs);
+int ss_at_mblen (struct substring, size_t ofs);
\f
/* Variable length strings. */
\f
/* Variable length strings. */
@@
-168,7
+177,7
@@
void ds_truncate (struct string *, size_t);
size_t ds_rtrim (struct string *, struct substring trim_set);
size_t ds_ltrim (struct string *, struct substring trim_set);
size_t ds_trim (struct string *, struct substring trim_set);
size_t ds_rtrim (struct string *, struct substring trim_set);
size_t ds_ltrim (struct string *, struct substring trim_set);
size_t ds_trim (struct string *, struct substring trim_set);
-bool ds_chomp (struct string *, char);
+bool ds_chomp
_byte
(struct string *, char);
bool ds_separate (const struct string *src, struct substring delimiters,
size_t *save_idx, struct substring *token);
bool ds_tokenize (const struct string *src, struct substring delimiters,
bool ds_separate (const struct string *src, struct substring delimiters,
size_t *save_idx, struct substring *token);
bool ds_tokenize (const struct string *src, struct substring delimiters,