You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2015/04/20 21:27:18 UTC
[2/2] lucy-clownfish git commit: Rename SStr_wrap_str to
SStr_wrap_utf8
Rename SStr_wrap_str to SStr_wrap_utf8
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/36f36eaf
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/36f36eaf
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/36f36eaf
Branch: refs/heads/master
Commit: 36f36eafa87f7c8b44ebd81688faecc042d909ae
Parents: c66b9f9
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sat Aug 9 18:31:11 2014 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Mon Apr 20 21:23:57 2015 +0200
----------------------------------------------------------------------
runtime/core/Clownfish/String.c | 4 ++--
runtime/core/Clownfish/String.cfh | 6 +++---
runtime/perl/xs/XSBind.c | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/36f36eaf/runtime/core/Clownfish/String.c
----------------------------------------------------------------------
diff --git a/runtime/core/Clownfish/String.c b/runtime/core/Clownfish/String.c
index d5a662b..2a4bbfe 100644
--- a/runtime/core/Clownfish/String.c
+++ b/runtime/core/Clownfish/String.c
@@ -550,7 +550,7 @@ SStr_new_from_str(void *allocation, size_t alloc_size, String *string) {
}
StackString*
-SStr_wrap_str(void *allocation, const char *ptr, size_t size) {
+SStr_wrap_utf8(void *allocation, const char *ptr, size_t size) {
StackString *self
= (StackString*)Class_Init_Obj(STACKSTRING, allocation);
self->size = size;
@@ -561,7 +561,7 @@ SStr_wrap_str(void *allocation, const char *ptr, size_t size) {
StackString*
SStr_wrap(void *allocation, String *source) {
- return SStr_wrap_str(allocation, source->ptr, source->size);
+ return SStr_wrap_utf8(allocation, source->ptr, source->size);
}
size_t
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/36f36eaf/runtime/core/Clownfish/String.cfh
----------------------------------------------------------------------
diff --git a/runtime/core/Clownfish/String.cfh b/runtime/core/Clownfish/String.cfh
index 5c0fb72..6ca7285 100644
--- a/runtime/core/Clownfish/String.cfh
+++ b/runtime/core/Clownfish/String.cfh
@@ -298,7 +298,7 @@ class Clownfish::StackString nickname SStr
wrap(void *allocation, String *source);
inert incremented StackString*
- wrap_str(void *allocation, const char *ptr, size_t size);
+ wrap_utf8(void *allocation, const char *utf8, size_t size);
/** Return the size for a StackString struct.
*/
@@ -430,13 +430,13 @@ class Clownfish::StackStringIterator nickname SStrIter
__C__
#define CFISH_SSTR_BLANK() \
- cfish_SStr_wrap_str(cfish_alloca(cfish_SStr_size()), "", 0)
+ cfish_SStr_wrap_utf8(cfish_alloca(cfish_SStr_size()), "", 0)
#define CFISH_SSTR_WRAP(source) \
cfish_SStr_wrap(cfish_alloca(cfish_SStr_size()), source)
#define CFISH_SSTR_WRAP_UTF8(ptr, size) \
- cfish_SStr_wrap_str(cfish_alloca(cfish_SStr_size()), ptr, size)
+ cfish_SStr_wrap_utf8(cfish_alloca(cfish_SStr_size()), ptr, size)
#define CFISH_STRITER_DONE -1
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/36f36eaf/runtime/perl/xs/XSBind.c
----------------------------------------------------------------------
diff --git a/runtime/perl/xs/XSBind.c b/runtime/perl/xs/XSBind.c
index 75c31e2..b853939 100644
--- a/runtime/perl/xs/XSBind.c
+++ b/runtime/perl/xs/XSBind.c
@@ -113,7 +113,7 @@ XSBind_maybe_sv_to_cfish_obj(pTHX_ SV *sv, cfish_Class *klass,
// StackString.
STRLEN size;
char *ptr = SvPVutf8(sv, size);
- retval = (cfish_Obj*)cfish_SStr_wrap_str(allocation, ptr, size);
+ retval = (cfish_Obj*)cfish_SStr_wrap_utf8(allocation, ptr, size);
}
else if (SvROK(sv)) {
// Attempt to convert Perl hashes and arrays into their Clownfish