From 35553ad8cc1022a19a677b5634980e822492c83b Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 11 Feb 2007 17:17:09 +0000 Subject: Support for copying multibyte string iterators. Cvs: ---------------------------------------------------------------------- --- lib/mbiter.h | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'lib/mbiter.h') diff --git a/lib/mbiter.h b/lib/mbiter.h index 92315c56f5..5fa8c233fe 100644 --- a/lib/mbiter.h +++ b/lib/mbiter.h @@ -1,5 +1,5 @@ /* Iterating through multibyte strings: macros for multi-byte encodings. - Copyright (C) 2001, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2005, 2007 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 @@ -65,6 +65,9 @@ mbi_reloc (iter, ptrdiff) relocates iterator when the string is moved by ptrdiff bytes. + mbi_copy (&destiter, &srciter) + copies srciter to destiter. + Here are the function prototypes of the macros. extern void mbi_init (mbi_iterator_t iter, @@ -74,6 +77,7 @@ extern mbchar_t mbi_cur (mbi_iterator_t iter); extern const char * mbi_cur_ptr (mbi_iterator_t iter); extern void mbi_reloc (mbi_iterator_t iter, ptrdiff_t ptrdiff); + extern void mbi_copy (mbi_iterator_t *new, const mbi_iterator_t *old); */ #ifndef _MBITER_H @@ -81,6 +85,7 @@ #include #include +#include /* Tru64 with Desktop Toolkit C has a bug: must be included before . @@ -174,6 +179,18 @@ mbiter_multi_reloc (struct mbiter_multi *iter, ptrdiff_t ptrdiff) iter->limit += ptrdiff; } +static inline void +mbiter_multi_copy (struct mbiter_multi *new_iter, const struct mbiter_multi *old_iter) +{ + new_iter->limit = old_iter->limit; + if ((new_iter->in_shift = old_iter->in_shift)) + memcpy (&new_iter->state, &old_iter->state, sizeof (mbstate_t)); + else + memset (&new_iter->state, 0, sizeof (mbstate_t)); + new_iter->next_done = old_iter->next_done; + mb_copy (&new_iter->cur, &old_iter->cur); +} + /* Iteration macros. */ typedef struct mbiter_multi mbi_iterator_t; #define mbi_init(iter, startptr, length) \ @@ -192,4 +209,7 @@ typedef struct mbiter_multi mbi_iterator_t; /* Relocation. */ #define mbi_reloc(iter, ptrdiff) mbiter_multi_reloc (&iter, ptrdiff) +/* Copying an iterator. */ +#define mbi_copy mbiter_multi_copy + #endif /* _MBITER_H */ -- cgit v1.2.1