From a6e3f90ba60482e679b8c60a2e2658058715da12 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 15 Aug 2010 00:42:00 +0200 Subject: [PATCH] Rename module 'memxfrm' to 'amemxfrm'. --- ChangeLog | 27 +++++++++++++++++++++++++++ MODULES.html.sh | 2 +- NEWS | 4 ++++ lib/{memxfrm.c => amemxfrm.c} | 4 ++-- lib/{memxfrm.h => amemxfrm.h} | 12 ++++++------ lib/unicase/u-casexfrm.h | 2 +- lib/unicase/u16-casexfrm.c | 2 +- lib/unicase/u32-casexfrm.c | 2 +- lib/unicase/u8-casexfrm.c | 2 +- lib/uninorm/u-normxfrm.h | 2 +- lib/uninorm/u16-normxfrm.c | 2 +- lib/uninorm/u32-normxfrm.c | 2 +- lib/uninorm/u8-normxfrm.c | 2 +- modules/{memxfrm => amemxfrm} | 8 ++++---- modules/unicase/u16-casexfrm | 2 +- modules/unicase/u32-casexfrm | 2 +- modules/unicase/u8-casexfrm | 2 +- modules/uninorm/u16-normxfrm | 2 +- modules/uninorm/u32-normxfrm | 2 +- modules/uninorm/u8-normxfrm | 2 +- 20 files changed, 58 insertions(+), 27 deletions(-) rename lib/{memxfrm.c => amemxfrm.c} (98%) rename lib/{memxfrm.h => amemxfrm.h} (86%) rename modules/{memxfrm => amemxfrm} (71%) diff --git a/ChangeLog b/ChangeLog index 97646f420..d86bbc37e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,32 @@ 2010-08-14 Bruno Haible + Rename module 'memxfrm' to 'amemxfrm'. + * lib/amemxfrm.h: Renamed from lib/memxfrm.h. + (amemxfrm): Renamed from memxfrm. + * lib/amemxfrm.c: Renamed from lib/memxfrm.h. Include amemxfrm.h. + (amemxfrm): Renamed from memxfrm. + * modules/amemxfrm: Renamed from modules/memxfrm. Update. + * NEWS: Mention the change. + * MODULES.html.sh (String handling ): Update. + * lib/unicase/u-casexfrm.h: Invoke amemxfrm instead of memxfrm. + * lib/unicase/u8-casexfrm.c: Include amemxfrm.h instead of memxfrm.h. + * lib/unicase/u16-casexfrm.c: Likewise. + * lib/unicase/u32-casexfrm.c: Likewise. + * lib/uninorm/u-normxfrm.h: Invoke amemxfrm instead of memxfrm. + * lib/uninorm/u8-normxfrm.c: Include amemxfrm.h instead of memxfrm.h. + * lib/uninorm/u16-normxfrm.c: Likewise. + * lib/uninorm/u32-normxfrm.c: Likewise. + * modules/unicase/u8-casexfrm (Depends-on): Add amemxfrm, remove + memxfrm. + * modules/unicase/u16-casexfrm (Depends-on): Likewise. + * modules/unicase/u32-casexfrm (Depends-on): Likewise. + * modules/uninorm/u8-normxfrm (Depends-on): Likewise. + * modules/uninorm/u16-normxfrm (Depends-on): Likewise. + * modules/uninorm/u32-normxfrm (Depends-on): Likewise. + Suggested by Paul Eggert. + +2010-08-14 Bruno Haible + Tests for module 'astrxfrm'. * modules/astrxfrm-tests: New file. * tests/test-astrxfrm.c: New file. diff --git a/MODULES.html.sh b/MODULES.html.sh index 76574ffea..7fc6b79fa 100755 --- a/MODULES.html.sh +++ b/MODULES.html.sh @@ -1778,7 +1778,7 @@ func_all_modules () func_module memmem-simple func_module mempcpy func_module memrchr - func_module memxfrm + func_module amemxfrm func_module rawmemchr func_module stpcpy func_module stpncpy diff --git a/NEWS b/NEWS index ff3bfb6c2..3f08cc49a 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,10 @@ User visible incompatible changes Date Modules Changes +2010-08-14 memxfrm This module is renamed to amemxfrm. The include + file is renamed to "amemxfrm.h". The function is + renamed to amemxfrm. + 2010-08-09 symlinkat This module now only provides symlinkat; use the new module 'readlinkat' if needed. diff --git a/lib/memxfrm.c b/lib/amemxfrm.c similarity index 98% rename from lib/memxfrm.c rename to lib/amemxfrm.c index d0a3c78ef..3823ce454 100644 --- a/lib/memxfrm.c +++ b/lib/amemxfrm.c @@ -18,14 +18,14 @@ #include /* Specification. */ -#include "memxfrm.h" +#include "amemxfrm.h" #include #include #include char * -memxfrm (char *s, size_t n, char *resultbuf, size_t *lengthp) +amemxfrm (char *s, size_t n, char *resultbuf, size_t *lengthp) { /* Result accumulator. */ char *result; diff --git a/lib/memxfrm.h b/lib/amemxfrm.h similarity index 86% rename from lib/memxfrm.h rename to lib/amemxfrm.h index 8b7284a65..2edf535ad 100644 --- a/lib/memxfrm.h +++ b/lib/amemxfrm.h @@ -1,5 +1,5 @@ /* Locale dependent memory area transformation for comparison. - Copyright (C) 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 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 Lesser General Public License as published @@ -14,8 +14,8 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#ifndef MEMXFRM_H -#define MEMXFRM_H +#ifndef AMEMXFRM_H +#define AMEMXFRM_H #include @@ -28,7 +28,7 @@ extern "C" { /* Transform the memory area [S..S+N-1] to a memory area, in such a way that comparing (S1,N1) and (S2,N2) with memcoll() is equivalent to comparing - memxfrm(S1,N1) and memxfrm(S2,N2) with memcmp2(). + amemxfrm(S1,N1) and amemxfrm(S2,N2) with memcmp2(). The byte S[N] may be temporarily overwritten by this function, but will be restored before this function returns. The result of this function depends on the LC_COLLATE category of the @@ -38,11 +38,11 @@ extern "C" { freshly allocated string is returned. In both cases, *lengthp is set to the length of the returned string. Upon failure, return NULL, with errno set. */ -extern char * memxfrm (char *s, size_t n, char *resultbuf, size_t *lengthp); +extern char * amemxfrm (char *s, size_t n, char *resultbuf, size_t *lengthp); #ifdef __cplusplus } #endif -#endif /* MEMXFRM_H */ +#endif /* AMEMXFRM_H */ diff --git a/lib/unicase/u-casexfrm.h b/lib/unicase/u-casexfrm.h index 5c7430c0f..b2725d4a6 100644 --- a/lib/unicase/u-casexfrm.h +++ b/lib/unicase/u-casexfrm.h @@ -70,7 +70,7 @@ FUNC (const UNIT *s, size_t n, const char *iso639_language, uninorm_t nf, } /* Apply locale dependent transformations for comparison. */ - result = memxfrm (convs, convs_length, resultbuf, lengthp); + result = amemxfrm (convs, convs_length, resultbuf, lengthp); if (result == NULL) { if (convs != convsbuf) diff --git a/lib/unicase/u16-casexfrm.c b/lib/unicase/u16-casexfrm.c index 661902fc3..63fe67495 100644 --- a/lib/unicase/u16-casexfrm.c +++ b/lib/unicase/u16-casexfrm.c @@ -26,7 +26,7 @@ #include "localcharset.h" #include "uniconv.h" -#include "memxfrm.h" +#include "amemxfrm.h" #define FUNC u16_casexfrm #define UNIT uint16_t diff --git a/lib/unicase/u32-casexfrm.c b/lib/unicase/u32-casexfrm.c index bd54497b1..c65df7265 100644 --- a/lib/unicase/u32-casexfrm.c +++ b/lib/unicase/u32-casexfrm.c @@ -26,7 +26,7 @@ #include "localcharset.h" #include "uniconv.h" -#include "memxfrm.h" +#include "amemxfrm.h" #define FUNC u32_casexfrm #define UNIT uint32_t diff --git a/lib/unicase/u8-casexfrm.c b/lib/unicase/u8-casexfrm.c index b3e0c664b..cd6f45ed4 100644 --- a/lib/unicase/u8-casexfrm.c +++ b/lib/unicase/u8-casexfrm.c @@ -26,7 +26,7 @@ #include "localcharset.h" #include "uniconv.h" -#include "memxfrm.h" +#include "amemxfrm.h" #define FUNC u8_casexfrm #define UNIT uint8_t diff --git a/lib/uninorm/u-normxfrm.h b/lib/uninorm/u-normxfrm.h index ce84ff675..1e0e53da6 100644 --- a/lib/uninorm/u-normxfrm.h +++ b/lib/uninorm/u-normxfrm.h @@ -69,7 +69,7 @@ FUNC (const UNIT *s, size_t n, uninorm_t nf, } /* Apply locale dependent transformations for comparison. */ - result = memxfrm (convs, convs_length, resultbuf, lengthp); + result = amemxfrm (convs, convs_length, resultbuf, lengthp); if (result == NULL) { if (convs != convsbuf) diff --git a/lib/uninorm/u16-normxfrm.c b/lib/uninorm/u16-normxfrm.c index 41d274ab0..d4af5ee33 100644 --- a/lib/uninorm/u16-normxfrm.c +++ b/lib/uninorm/u16-normxfrm.c @@ -25,7 +25,7 @@ #include "localcharset.h" #include "uniconv.h" -#include "memxfrm.h" +#include "amemxfrm.h" #define FUNC u16_normxfrm #define UNIT uint16_t diff --git a/lib/uninorm/u32-normxfrm.c b/lib/uninorm/u32-normxfrm.c index 7e953f98a..0d1629d76 100644 --- a/lib/uninorm/u32-normxfrm.c +++ b/lib/uninorm/u32-normxfrm.c @@ -25,7 +25,7 @@ #include "localcharset.h" #include "uniconv.h" -#include "memxfrm.h" +#include "amemxfrm.h" #define FUNC u32_normxfrm #define UNIT uint32_t diff --git a/lib/uninorm/u8-normxfrm.c b/lib/uninorm/u8-normxfrm.c index 47d4fdc0d..2564f1cf9 100644 --- a/lib/uninorm/u8-normxfrm.c +++ b/lib/uninorm/u8-normxfrm.c @@ -25,7 +25,7 @@ #include "localcharset.h" #include "uniconv.h" -#include "memxfrm.h" +#include "amemxfrm.h" #define FUNC u8_normxfrm #define UNIT uint8_t diff --git a/modules/memxfrm b/modules/amemxfrm similarity index 71% rename from modules/memxfrm rename to modules/amemxfrm index 8c9033ca6..a5fb244ce 100644 --- a/modules/memxfrm +++ b/modules/amemxfrm @@ -2,18 +2,18 @@ Description: Locale dependent memory area transformation for comparison. Files: -lib/memxfrm.h -lib/memxfrm.c +lib/amemxfrm.h +lib/amemxfrm.c Depends-on: configure.ac: Makefile.am: -lib_SOURCES += memxfrm.c +lib_SOURCES += amemxfrm.c Include: -"memxfrm.h" +"amemxfrm.h" License: LGPL diff --git a/modules/unicase/u16-casexfrm b/modules/unicase/u16-casexfrm index 78774e2a7..a79d16375 100644 --- a/modules/unicase/u16-casexfrm +++ b/modules/unicase/u16-casexfrm @@ -11,7 +11,7 @@ unicase/base unicase/u16-casefold uniconv/u16-conv-to-enc localcharset -memxfrm +amemxfrm configure.ac: gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u16-casexfrm]) diff --git a/modules/unicase/u32-casexfrm b/modules/unicase/u32-casexfrm index 6fb660eab..0f86654c2 100644 --- a/modules/unicase/u32-casexfrm +++ b/modules/unicase/u32-casexfrm @@ -11,7 +11,7 @@ unicase/base unicase/u32-casefold uniconv/u32-conv-to-enc localcharset -memxfrm +amemxfrm configure.ac: gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u32-casexfrm]) diff --git a/modules/unicase/u8-casexfrm b/modules/unicase/u8-casexfrm index 968dd59be..bc029125d 100644 --- a/modules/unicase/u8-casexfrm +++ b/modules/unicase/u8-casexfrm @@ -11,7 +11,7 @@ unicase/base unicase/u8-casefold uniconv/u8-conv-to-enc localcharset -memxfrm +amemxfrm configure.ac: gl_LIBUNISTRING_MODULE([0.9.1], [unicase/u8-casexfrm]) diff --git a/modules/uninorm/u16-normxfrm b/modules/uninorm/u16-normxfrm index 9305b55e4..82ba01e94 100644 --- a/modules/uninorm/u16-normxfrm +++ b/modules/uninorm/u16-normxfrm @@ -10,7 +10,7 @@ uninorm/base uninorm/u16-normalize uniconv/u16-conv-to-enc localcharset -memxfrm +amemxfrm configure.ac: gl_LIBUNISTRING_MODULE([0.9], [uninorm/u16-normxfrm]) diff --git a/modules/uninorm/u32-normxfrm b/modules/uninorm/u32-normxfrm index 9cb06413e..8e4635b6a 100644 --- a/modules/uninorm/u32-normxfrm +++ b/modules/uninorm/u32-normxfrm @@ -10,7 +10,7 @@ uninorm/base uninorm/u32-normalize uniconv/u32-conv-to-enc localcharset -memxfrm +amemxfrm configure.ac: gl_LIBUNISTRING_MODULE([0.9], [uninorm/u32-normxfrm]) diff --git a/modules/uninorm/u8-normxfrm b/modules/uninorm/u8-normxfrm index 123d1a7a1..4c90b8ce5 100644 --- a/modules/uninorm/u8-normxfrm +++ b/modules/uninorm/u8-normxfrm @@ -10,7 +10,7 @@ uninorm/base uninorm/u8-normalize uniconv/u8-conv-to-enc localcharset -memxfrm +amemxfrm configure.ac: gl_LIBUNISTRING_MODULE([0.9], [uninorm/u8-normxfrm]) -- 2.11.0