lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nwelln...@apache.org
Subject [lucy-commits] [03/11] git commit: refs/heads/cfish-string-prep1 - Rename a couple of variables referring to ZombieCharBufs
Date Sat, 28 Sep 2013 17:33:03 GMT
Rename a couple of variables referring to ZombieCharBufs


Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/3accd4de
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/3accd4de
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/3accd4de

Branch: refs/heads/cfish-string-prep1
Commit: 3accd4dec94bed932a47a449e3ac813baab7ab7c
Parents: 3f96ac1
Author: Nick Wellnhofer <wellnhofer@aevum.de>
Authored: Sat Sep 28 16:19:38 2013 +0200
Committer: Nick Wellnhofer <wellnhofer@aevum.de>
Committed: Sat Sep 28 16:19:38 2013 +0200

----------------------------------------------------------------------
 c/src/Lucy/Index/DocReader.c        | 4 ++--
 clownfish/compiler/src/CFCPerlSub.c | 8 ++++----
 perl/xs/Lucy/Index/DocReader.c      | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/3accd4de/c/src/Lucy/Index/DocReader.c
----------------------------------------------------------------------
diff --git a/c/src/Lucy/Index/DocReader.c b/c/src/Lucy/Index/DocReader.c
index ebd213c..a887fea 100644
--- a/c/src/Lucy/Index/DocReader.c
+++ b/c/src/Lucy/Index/DocReader.c
@@ -66,9 +66,9 @@ DefDocReader_Fetch_Doc_IMP(DefaultDocReader *self, int32_t doc_id) {
         InStream_Read_Bytes(dat_in, field_name, field_name_len);
 
         // Find the Field's FieldType.
-        StackString *field_name_zcb
+        StackString *field_name_str
             = SSTR_WRAP_UTF8(field_name, field_name_len);
-        type = Schema_Fetch_Type(schema, (String*)field_name_zcb);
+        type = Schema_Fetch_Type(schema, (String*)field_name_str);
 
         // Read the field value.
         switch (FType_Primitive_ID(type) & FType_PRIMITIVE_ID_MASK) {

http://git-wip-us.apache.org/repos/asf/lucy/blob/3accd4de/clownfish/compiler/src/CFCPerlSub.c
----------------------------------------------------------------------
diff --git a/clownfish/compiler/src/CFCPerlSub.c b/clownfish/compiler/src/CFCPerlSub.c
index c71e990..5d8d1f2 100644
--- a/clownfish/compiler/src/CFCPerlSub.c
+++ b/clownfish/compiler/src/CFCPerlSub.c
@@ -152,12 +152,12 @@ S_allot_params_arg(CFCType *type, const char *label, int required) {
            ) {
             use_sv_buffer = true;
         }
-        const char *zcb_allocation = use_sv_buffer
-                                     ? "alloca(cfish_SStr_size())"
-                                     : "NULL";
+        const char *allocation = use_sv_buffer
+                                 ? "alloca(cfish_SStr_size())"
+                                 : "NULL";
         const char pattern[] = "ALLOT_OBJ(&%s, \"%s\", %u, %s, %s, %s)";
         char *arg = CFCUtil_sprintf(pattern, label, label, label_len,
-                                    req_string, vtable_var, zcb_allocation);
+                                    req_string, vtable_var, allocation);
         return arg;
     }
     else if (CFCType_is_primitive(type)) {

http://git-wip-us.apache.org/repos/asf/lucy/blob/3accd4de/perl/xs/Lucy/Index/DocReader.c
----------------------------------------------------------------------
diff --git a/perl/xs/Lucy/Index/DocReader.c b/perl/xs/Lucy/Index/DocReader.c
index 29a0359..90a929e 100644
--- a/perl/xs/Lucy/Index/DocReader.c
+++ b/perl/xs/Lucy/Index/DocReader.c
@@ -61,9 +61,9 @@ LUCY_DefDocReader_Fetch_Doc_IMP(lucy_DefaultDocReader *self, int32_t doc_id)
{
         *SvEND(field_name_sv) = '\0';
 
         // Find the Field's FieldType.
-        cfish_StackString *field_name_zcb
+        cfish_StackString *field_name_str
             = CFISH_SSTR_WRAP_UTF8(field_name_ptr, field_name_len);
-        type = LUCY_Schema_Fetch_Type(schema, (cfish_String*)field_name_zcb);
+        type = LUCY_Schema_Fetch_Type(schema, (cfish_String*)field_name_str);
 
         // Read the field value.
         switch (LUCY_FType_Primitive_ID(type) & lucy_FType_PRIMITIVE_ID_MASK) {


Mime
View raw message