lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nwelln...@apache.org
Subject [lucy-commits] [15/24] git commit: refs/heads/cfish-string-prep1 - Whitespace fixes
Date Sun, 01 Sep 2013 20:17:03 GMT
Whitespace fixes


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

Branch: refs/heads/cfish-string-prep1
Commit: a3f930c8a13e8cff65abdec7392531f18b18ef5b
Parents: 2c3dbf1
Author: Nick Wellnhofer <wellnhofer@aevum.de>
Authored: Thu Aug 29 00:59:53 2013 +0200
Committer: Nick Wellnhofer <wellnhofer@aevum.de>
Committed: Sun Sep 1 19:20:00 2013 +0200

----------------------------------------------------------------------
 c/sample/getting_started.c                      |  6 +-
 clownfish/compiler/perl/t/401-class.t           |  4 +-
 clownfish/compiler/src/CFCBindCore.c            |  2 +-
 clownfish/compiler/src/CFCTestClass.c           |  4 +-
 clownfish/runtime/core/Clownfish/Obj.c          |  2 +-
 clownfish/runtime/core/Clownfish/Test/TestObj.c |  2 +-
 .../perl/buildlib/Clownfish/Build/Binding.pm    |  6 +-
 clownfish/runtime/perl/xs/XSBind.c              |  4 +-
 core/Lucy/Analysis/RegexTokenizer.cfh           |  2 +-
 core/Lucy/Index/BackgroundMerger.c              |  2 +-
 core/Lucy/Index/DeletionsReader.c               |  4 +-
 core/Lucy/Index/DeletionsWriter.c               |  4 +-
 core/Lucy/Index/DocReader.c                     |  2 +-
 core/Lucy/Index/DocVector.c                     |  2 +-
 core/Lucy/Index/DocWriter.c                     |  2 +-
 core/Lucy/Index/LexIndex.c                      |  6 +-
 core/Lucy/Index/LexiconReader.c                 |  4 +-
 core/Lucy/Index/PolyReader.c                    |  2 +-
 core/Lucy/Index/PolyReader.cfh                  |  2 +-
 core/Lucy/Index/PostingListWriter.c             |  2 +-
 core/Lucy/Index/PostingPool.c                   |  2 +-
 core/Lucy/Index/SegReader.cfh                   |  2 +-
 core/Lucy/Index/SegWriter.c                     |  2 +-
 core/Lucy/Index/Segment.c                       |  4 +-
 core/Lucy/Index/SkipStepper.c                   |  2 +-
 core/Lucy/Index/SortFieldWriter.c               |  2 +-
 core/Lucy/Index/SortWriter.c                    |  4 +-
 core/Lucy/Index/TermVector.c                    |  2 +-
 core/Lucy/Plan/Schema.c                         |  2 +-
 core/Lucy/Plan/TextType.c                       | 12 ++--
 core/Lucy/Search/PhraseQuery.c                  |  2 +-
 core/Lucy/Search/QueryParser.c                  |  6 +-
 core/Lucy/Search/QueryParser/QueryLexer.c       |  4 +-
 core/Lucy/Search/RangeQuery.c                   | 22 +++----
 core/Lucy/Search/TermQuery.c                    |  8 +--
 core/Lucy/Search/TermQuery.cfh                  |  2 +-
 core/Lucy/Store/CompoundFileReader.c            | 14 ++---
 core/Lucy/Store/CompoundFileWriter.c            |  4 +-
 core/Lucy/Store/FSDirHandle.c                   |  8 +--
 core/Lucy/Store/FSFileHandle.c                  | 66 ++++++++++----------
 core/Lucy/Store/FSFolder.c                      | 14 ++---
 core/Lucy/Store/Folder.c                        | 10 +--
 core/Lucy/Store/Folder.cfh                      |  2 +-
 core/Lucy/Store/InStream.c                      |  2 +-
 core/Lucy/Store/Lock.c                          | 12 ++--
 core/Lucy/Store/OutStream.c                     |  2 +-
 core/Lucy/Store/RAMFileHandle.c                 | 12 ++--
 core/Lucy/Store/RAMFolder.c                     | 16 ++---
 core/Lucy/Store/SharedLock.c                    |  2 +-
 core/Lucy/Test/Analysis/TestNormalizer.c        |  2 +-
 core/Lucy/Test/Analysis/TestSnowballStemmer.c   |  2 +-
 core/Lucy/Test/Highlight/TestHighlighter.c      |  4 +-
 core/Lucy/Test/Search/TestQueryParser.cfh       |  2 +-
 core/Lucy/Test/Search/TestQueryParserLogic.c    |  4 +-
 core/Lucy/Test/Search/TestQueryParserSyntax.c   |  2 +-
 core/Lucy/Test/TestUtils.c                      |  4 +-
 core/Lucy/Util/Freezer.c                        |  2 +-
 core/Lucy/Util/Json.c                           |  4 +-
 core/LucyX/Search/ProximityQuery.c              |  2 +-
 59 files changed, 167 insertions(+), 167 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/c/sample/getting_started.c
----------------------------------------------------------------------
diff --git a/c/sample/getting_started.c b/c/sample/getting_started.c
index 2897258..ae2e2b0 100644
--- a/c/sample/getting_started.c
+++ b/c/sample/getting_started.c
@@ -58,7 +58,7 @@ main() {
     // Initialize the library.
     lucy_bootstrap_parcel();
 
-    Schema  *schema = S_create_schema();
+    Schema *schema = S_create_schema();
     String *folder = Str_newf("lucy_index");
 
     S_index_documents(schema, folder);
@@ -166,10 +166,10 @@ S_search(IndexSearcher *searcher, const char *query) {
 
     // Execute search query.
     String *query_cb = Str_new_from_utf8(query, strlen(query));
-    Hits    *hits     = IxSearcher_Hits(searcher, (Obj*)query_cb, 0, 10, NULL);
+    Hits   *hits     = IxSearcher_Hits(searcher, (Obj*)query_cb, 0, 10, NULL);
 
     String *field_cb = Str_newf("title");
-    HitDoc  *hit;
+    HitDoc *hit;
     int i = 1;
 
     // Loop over search results.

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/clownfish/compiler/perl/t/401-class.t
----------------------------------------------------------------------
diff --git a/clownfish/compiler/perl/t/401-class.t b/clownfish/compiler/perl/t/401-class.t
index 76b5ae3..1c83a90 100644
--- a/clownfish/compiler/perl/t/401-class.t
+++ b/clownfish/compiler/perl/t/401-class.t
@@ -185,13 +185,13 @@ $class_content = q|
         inert uint64_t num_dogs;
         public inert Dog* top_dog;
 
-        String *name;
+        String  *name;
         bool     likes_to_go_fetch;
         ChewToy *squishy;
         Owner   *mom;
 
         void               Destroy(Dog *self);
-        public String*    Bark(Dog *self);
+        public String*     Bark(Dog *self);
         public void        Eat(Dog *self);
         public void        Bite(Dog *self, Enemy *enemy);
         public Thing      *Fetch(Dog *self, Thing *thing);

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/clownfish/compiler/src/CFCBindCore.c
----------------------------------------------------------------------
diff --git a/clownfish/compiler/src/CFCBindCore.c b/clownfish/compiler/src/CFCBindCore.c
index 50661a2..5ae8ac6 100644
--- a/clownfish/compiler/src/CFCBindCore.c
+++ b/clownfish/compiler/src/CFCBindCore.c
@@ -428,7 +428,7 @@ S_write_parcel_c(CFCBindCore *self, CFCParcel *parcel) {
         "%s\n"
         "#include \"%sparcel.h\"\n"
         "#include \"callbacks.h\"\n"
-        "#include \"Clownfish/String.h\"\n" // Needed for dump/load.
+        "#include \"Clownfish/String.h\"\n"  // Needed for dump/load.
         "#include \"Clownfish/Err.h\"\n"     // Needed for dump/load.
         "#include \"Clownfish/Num.h\"\n"     // Needed for dump/load.
         "#include \"Clownfish/VArray.h\"\n"  // Needed for dump/load.

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/clownfish/compiler/src/CFCTestClass.c
----------------------------------------------------------------------
diff --git a/clownfish/compiler/src/CFCTestClass.c b/clownfish/compiler/src/CFCTestClass.c
index 01ef19b..e33d454 100644
--- a/clownfish/compiler/src/CFCTestClass.c
+++ b/clownfish/compiler/src/CFCTestClass.c
@@ -260,13 +260,13 @@ S_run_tests(CFCTest *test) {
             "    inert uint64_t num_dogs;\n"
             "    public inert Dog *top_dog;\n"
             "\n"
-            "    String *name;\n"
+            "    String  *name;\n"
             "    bool     likes_to_go_fetch;\n"
             "    ChewToy *squishy;\n"
             "    Owner   *mom;\n"
             "\n"
             "    void               Destroy(Dog *self);\n"
-            "    public String*    Bark(Dog *self);\n"
+            "    public String*     Bark(Dog *self);\n"
             "    public void        Eat(Dog *self);\n"
             "    public void        Bite(Dog *self, Enemy *enemy);\n"
             "    public Thing      *Fetch(Dog *self, Thing *thing);\n"

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/clownfish/runtime/core/Clownfish/Obj.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Obj.c b/clownfish/runtime/core/Clownfish/Obj.c
index 0bc8b44..d76ea19 100644
--- a/clownfish/runtime/core/Clownfish/Obj.c
+++ b/clownfish/runtime/core/Clownfish/Obj.c
@@ -78,7 +78,7 @@ Obj_To_String_IMP(Obj *self) {
     uint32_t  address_hi = address >> 32;
     uint32_t  address_lo = address & 0xFFFFFFFF;
     return Str_newf("%o@0x%x32%x32", Obj_Get_Class_Name(self), address_hi,
-                   address_lo);
+                    address_lo);
 #else
   #error "Unexpected pointer size."
 #endif

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/clownfish/runtime/core/Clownfish/Test/TestObj.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Test/TestObj.c b/clownfish/runtime/core/Clownfish/Test/TestObj.c
index 0d951be..eba6122 100644
--- a/clownfish/runtime/core/Clownfish/Test/TestObj.c
+++ b/clownfish/runtime/core/Clownfish/Test/TestObj.c
@@ -104,7 +104,7 @@ test_Hash_Sum(TestBatchRunner *runner) {
 static void
 test_Is_A(TestBatchRunner *runner) {
     String *charbuf   = Str_new(0);
-    VTable  *bb_vtable = Str_Get_VTable(charbuf);
+    VTable *bb_vtable = Str_Get_VTable(charbuf);
     String *klass     = Str_Get_Class_Name(charbuf);
 
     TEST_TRUE(runner, Str_Is_A(charbuf, STRING), "String Is_A String.");

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/clownfish/runtime/perl/buildlib/Clownfish/Build/Binding.pm
----------------------------------------------------------------------
diff --git a/clownfish/runtime/perl/buildlib/Clownfish/Build/Binding.pm b/clownfish/runtime/perl/buildlib/Clownfish/Build/Binding.pm
index d731e22..931d357 100644
--- a/clownfish/runtime/perl/buildlib/Clownfish/Build/Binding.pm
+++ b/clownfish/runtime/perl/buildlib/Clownfish/Build/Binding.pm
@@ -273,9 +273,9 @@ OUTPUT: RETVAL
 
 void
 store(self, key, value);
-    cfish_Hash          *self;
+    cfish_Hash         *self;
     const cfish_String *key;
-    cfish_Obj           *value;
+    cfish_Obj          *value;
 PPCODE:
 {
     if (value) { CFISH_INCREF(value); }
@@ -609,7 +609,7 @@ CODE:
 {
     CFISH_UNUSED_VAR(unused_sv);
     cfish_String *class_name = NULL;
-    cfish_VTable  *parent     = NULL;
+    cfish_VTable *parent     = NULL;
     bool args_ok
         = XSBind_allot_params(&(ST(0)), 1, items,
                               ALLOT_OBJ(&class_name, "class_name", 10, true,

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/clownfish/runtime/perl/xs/XSBind.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/perl/xs/XSBind.c b/clownfish/runtime/perl/xs/XSBind.c
index f8dbcc1..f1e9ab1 100644
--- a/clownfish/runtime/perl/xs/XSBind.c
+++ b/clownfish/runtime/perl/xs/XSBind.c
@@ -498,7 +498,7 @@ S_extract_from_sv(SV *value, void *target, const char *label,
     // values.
     if (required && !valid_assignment) {
         cfish_String *mess = CFISH_MAKE_MESS("Missing required param %s",
-                                              label);
+                                             label);
         cfish_Err_set_error(cfish_Err_new(mess));
         return false;
     }
@@ -891,7 +891,7 @@ cfish_Err_trap(CFISH_Err_Attempt_t routine, void *context) {
     if (count != 0) {
         cfish_String *mess
             = cfish_Str_newf("'attempt' returned too many values: %i32",
-                           (int32_t)count);
+                             (int32_t)count);
         error = cfish_Err_new(mess);
     }
     else {

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Analysis/RegexTokenizer.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/RegexTokenizer.cfh b/core/Lucy/Analysis/RegexTokenizer.cfh
index edef1b6..fb0fb56 100644
--- a/core/Lucy/Analysis/RegexTokenizer.cfh
+++ b/core/Lucy/Analysis/RegexTokenizer.cfh
@@ -51,7 +51,7 @@ public class Lucy::Analysis::RegexTokenizer
     inherits Lucy::Analysis::Analyzer {
 
     String *pattern;
-    void    *token_re;
+    void   *token_re;
 
     /**
      * @return true if RegexTokenizer is available in this build.

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Index/BackgroundMerger.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/BackgroundMerger.c b/core/Lucy/Index/BackgroundMerger.c
index 3e88c1e..fe94a7d 100644
--- a/core/Lucy/Index/BackgroundMerger.c
+++ b/core/Lucy/Index/BackgroundMerger.c
@@ -315,7 +315,7 @@ S_merge_updated_deletions(BackgroundMerger *self) {
         int64_t  merge_seg_num = Seg_Get_Number(ivars->segment);
         uint32_t seg_tick      = INT32_MAX;
         int32_t  offset        = INT32_MAX;
-        String *seg_name      = NULL;
+        String  *seg_name      = NULL;
         Matcher *deletions     = NULL;
 
         SegWriter_Prep_Seg_Dir(seg_writer);

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Index/DeletionsReader.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/DeletionsReader.c b/core/Lucy/Index/DeletionsReader.c
index 30b9f5f..3e21ada 100644
--- a/core/Lucy/Index/DeletionsReader.c
+++ b/core/Lucy/Index/DeletionsReader.c
@@ -158,8 +158,8 @@ DefDelReader_Read_Deletions_IMP(DefaultDeletionsReader *self) {
     DefaultDeletionsReaderIVARS *const ivars = DefDelReader_IVARS(self);
     VArray  *segments    = DefDelReader_Get_Segments(self);
     Segment *segment     = DefDelReader_Get_Segment(self);
-    String *my_seg_name = Seg_Get_Name(segment);
-    String *del_file    = NULL;
+    String  *my_seg_name = Seg_Get_Name(segment);
+    String  *del_file    = NULL;
     int32_t  del_count   = 0;
 
     // Start with deletions files in the most recently added segments and work

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Index/DeletionsWriter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/DeletionsWriter.c b/core/Lucy/Index/DeletionsWriter.c
index 35a2a2e..2bb0f02 100644
--- a/core/Lucy/Index/DeletionsWriter.c
+++ b/core/Lucy/Index/DeletionsWriter.c
@@ -135,7 +135,7 @@ S_del_filename(DefaultDeletionsWriter *self, SegReader *target_reader) {
     DefaultDeletionsWriterIVARS *const ivars = DefDelWriter_IVARS(self);
     Segment *target_seg = SegReader_Get_Segment(target_reader);
     return Str_newf("%o/deletions-%o.bv", Seg_Get_Name(ivars->segment),
-                   Seg_Get_Name(target_seg));
+                    Seg_Get_Name(target_seg));
 }
 
 void
@@ -211,7 +211,7 @@ DefDelWriter_Seg_Deletions_IMP(DefaultDeletionsWriter *self,
     DefaultDeletionsWriterIVARS *const ivars = DefDelWriter_IVARS(self);
     Matcher *deletions    = NULL;
     Segment *segment      = SegReader_Get_Segment(seg_reader);
-    String *seg_name     = Seg_Get_Name(segment);
+    String  *seg_name     = Seg_Get_Name(segment);
     Integer32 *tick_obj   = (Integer32*)Hash_Fetch(ivars->name_to_tick,
                                                    (Obj*)seg_name);
     int32_t tick          = tick_obj ? Int32_Get_Value(tick_obj) : 0;

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Index/DocReader.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/DocReader.c b/core/Lucy/Index/DocReader.c
index 4fa87f8..483af50 100644
--- a/core/Lucy/Index/DocReader.c
+++ b/core/Lucy/Index/DocReader.c
@@ -145,7 +145,7 @@ DefDocReader_init(DefaultDocReader *self, Schema *schema, Folder *folder,
         String *seg_name  = Seg_Get_Name(segment);
         String *ix_file   = Str_newf("%o/documents.ix", seg_name);
         String *dat_file  = Str_newf("%o/documents.dat", seg_name);
-        Obj     *format    = Hash_Fetch_Str(metadata, "format", 6);
+        Obj     *format   = Hash_Fetch_Str(metadata, "format", 6);
 
         // Check format.
         if (!format) { THROW(ERR, "Missing 'format' var"); }

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Index/DocVector.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/DocVector.c b/core/Lucy/Index/DocVector.c
index 3645bf7..dcece25 100644
--- a/core/Lucy/Index/DocVector.c
+++ b/core/Lucy/Index/DocVector.c
@@ -121,7 +121,7 @@ S_extract_tv_cache(ByteBuf *field_buf) {
     Hash    *tv_cache  = Hash_new(0);
     char    *tv_string = BB_Get_Buf(field_buf);
     int32_t  num_terms = NumUtil_decode_c32(&tv_string);
-    String *text      = Str_new(0);
+    String  *text      = Str_new(0);
 
     // Read the number of highlightable terms in the field.
     for (int32_t i = 0; i < num_terms; i++) {

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Index/DocWriter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/DocWriter.c b/core/Lucy/Index/DocWriter.c
index 1ebc1fd..5798170 100644
--- a/core/Lucy/Index/DocWriter.c
+++ b/core/Lucy/Index/DocWriter.c
@@ -62,7 +62,7 @@ static OutStream*
 S_lazy_init(DocWriter *self) {
     DocWriterIVARS *const ivars = DocWriter_IVARS(self);
     if (!ivars->dat_out) {
-        Folder  *folder   = ivars->folder;
+        Folder *folder   = ivars->folder;
         String *seg_name = Seg_Get_Name(ivars->segment);
 
         // Get streams.

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Index/LexIndex.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/LexIndex.c b/core/Lucy/Index/LexIndex.c
index b9039db..3ef77b2 100644
--- a/core/Lucy/Index/LexIndex.c
+++ b/core/Lucy/Index/LexIndex.c
@@ -42,9 +42,9 @@ LexIndex*
 LexIndex_init(LexIndex *self, Schema *schema, Folder *folder,
               Segment *segment, const String *field) {
     int32_t  field_num = Seg_Field_Num(segment, field);
-    String *seg_name  = Seg_Get_Name(segment);
-    String *ixix_file = Str_newf("%o/lexicon-%i32.ixix", seg_name, field_num);
-    String *ix_file   = Str_newf("%o/lexicon-%i32.ix", seg_name, field_num);
+    String  *seg_name  = Seg_Get_Name(segment);
+    String  *ixix_file = Str_newf("%o/lexicon-%i32.ixix", seg_name, field_num);
+    String  *ix_file   = Str_newf("%o/lexicon-%i32.ix", seg_name, field_num);
     Architecture *arch = Schema_Get_Architecture(schema);
 
     // Init.

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Index/LexiconReader.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/LexiconReader.c b/core/Lucy/Index/LexiconReader.c
index 0a8b434..fa00da8 100644
--- a/core/Lucy/Index/LexiconReader.c
+++ b/core/Lucy/Index/LexiconReader.c
@@ -148,8 +148,8 @@ S_has_data(Schema *schema, Folder *folder, Segment *segment, String *field) {
     else {
         // Bail out if there are no terms for this field in this segment.
         int32_t  field_num = Seg_Field_Num(segment, field);
-        String *seg_name  = Seg_Get_Name(segment);
-        String *file = Str_newf("%o/lexicon-%i32.dat", seg_name, field_num);
+        String  *seg_name  = Seg_Get_Name(segment);
+        String  *file = Str_newf("%o/lexicon-%i32.dat", seg_name, field_num);
         bool retval = Folder_Exists(folder, file);
         DECREF(file);
         return retval;

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Index/PolyReader.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/PolyReader.c b/core/Lucy/Index/PolyReader.c
index 47c441e..e63a639 100644
--- a/core/Lucy/Index/PolyReader.c
+++ b/core/Lucy/Index/PolyReader.c
@@ -132,7 +132,7 @@ S_init_sub_readers(PolyReader *self, VArray *sub_readers) {
     ivars->offsets = I32Arr_new_steal(starts, num_sub_readers);
 
     String *api;
-    VArray  *readers;
+    VArray *readers;
     Hash_Iterate(data_readers);
     while (Hash_Next(data_readers, (Obj**)&api, (Obj**)&readers)) {
         DataReader *datareader

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Index/PolyReader.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/PolyReader.cfh b/core/Lucy/Index/PolyReader.cfh
index 29f6088..6624c7a 100644
--- a/core/Lucy/Index/PolyReader.cfh
+++ b/core/Lucy/Index/PolyReader.cfh
@@ -56,7 +56,7 @@ public class Lucy::Index::PolyReader inherits Lucy::Index::IndexReader {
          Snapshot *snapshot = NULL, IndexManager *manager = NULL,
          VArray *sub_readers = NULL);
 
-    inert String* race_condition_debug1;
+    inert String  *race_condition_debug1;
     inert int32_t  debug1_num_passes;
 
     /** Determine which sub-reader a document id belongs to.

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Index/PostingListWriter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/PostingListWriter.c b/core/Lucy/Index/PostingListWriter.c
index 8685b77..0245413 100644
--- a/core/Lucy/Index/PostingListWriter.c
+++ b/core/Lucy/Index/PostingListWriter.c
@@ -81,7 +81,7 @@ static void
 S_lazy_init(PostingListWriter *self) {
     PostingListWriterIVARS *const ivars = PListWriter_IVARS(self);
     if (!ivars->lex_temp_out) {
-        Folder  *folder         = ivars->folder;
+        Folder *folder         = ivars->folder;
         String *seg_name       = Seg_Get_Name(ivars->segment);
         String *lex_temp_path  = Str_newf("%o/lextemp", seg_name);
         String *post_temp_path = Str_newf("%o/ptemp", seg_name);

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Index/PostingPool.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/PostingPool.c b/core/Lucy/Index/PostingPool.c
index 40bb9fc..0794bc4 100644
--- a/core/Lucy/Index/PostingPool.c
+++ b/core/Lucy/Index/PostingPool.c
@@ -427,7 +427,7 @@ S_write_terms_and_postings(PostingPool *self, PostingWriter *post_writer,
 
             // Remember the term_text so we can write string diffs.
             Str_Mimic_Str(last_term_text, post_ivars->blob,
-                         post_ivars->content_len);
+                          post_ivars->content_len);
             last_text_buf  = (char*)Str_Get_Ptr8(last_term_text);
             last_text_size = Str_Get_Size(last_term_text);
         }

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Index/SegReader.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SegReader.cfh b/core/Lucy/Index/SegReader.cfh
index 2e08e84..ee5e638 100644
--- a/core/Lucy/Index/SegReader.cfh
+++ b/core/Lucy/Index/SegReader.cfh
@@ -33,7 +33,7 @@ public class Lucy::Index::SegReader inherits Lucy::Index::IndexReader {
     int32_t  doc_max;
     int32_t  del_count;
     int64_t  seg_num;
-    String *seg_name;
+    String  *seg_name;
 
     inert incremented SegReader*
     new(Schema *schema, Folder *folder, Snapshot *snapshot = NULL,

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Index/SegWriter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SegWriter.c b/core/Lucy/Index/SegWriter.c
index d06c050..d980ab9 100644
--- a/core/Lucy/Index/SegWriter.c
+++ b/core/Lucy/Index/SegWriter.c
@@ -86,7 +86,7 @@ SegWriter_Add_Writer_IMP(SegWriter *self, DataWriter *writer) {
 void
 SegWriter_Prep_Seg_Dir_IMP(SegWriter *self) {
     SegWriterIVARS *const ivars = SegWriter_IVARS(self);
-    Folder  *folder   = SegWriter_Get_Folder(self);
+    Folder *folder   = SegWriter_Get_Folder(self);
     String *seg_name = Seg_Get_Name(ivars->segment);
 
     // Clear stale segment files from crashed indexing sessions.

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Index/Segment.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Segment.c b/core/Lucy/Index/Segment.c
index b80bf78..bd283d0 100644
--- a/core/Lucy/Index/Segment.c
+++ b/core/Lucy/Index/Segment.c
@@ -91,8 +91,8 @@ bool
 Seg_Read_File_IMP(Segment *self, Folder *folder) {
     SegmentIVARS *const ivars = Seg_IVARS(self);
     String *filename = Str_newf("%o/segmeta.json", ivars->name);
-    Hash    *metadata = (Hash*)Json_slurp_json(folder, filename);
-    Hash    *my_metadata;
+    Hash   *metadata = (Hash*)Json_slurp_json(folder, filename);
+    Hash   *my_metadata;
 
     // Bail unless the segmeta file was read successfully.
     DECREF(filename);

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Index/SkipStepper.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SkipStepper.c b/core/Lucy/Index/SkipStepper.c
index a78ff4f..a3fc5b4 100644
--- a/core/Lucy/Index/SkipStepper.c
+++ b/core/Lucy/Index/SkipStepper.c
@@ -55,7 +55,7 @@ String*
 SkipStepper_To_String_IMP(SkipStepper *self) {
     SkipStepperIVARS *const ivars = SkipStepper_IVARS(self);
     return Str_newf("skip doc: %u32 file pointer: %i64", ivars->doc_id,
-                   ivars->filepos);
+                    ivars->filepos);
 }
 
 void

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Index/SortFieldWriter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SortFieldWriter.c b/core/Lucy/Index/SortFieldWriter.c
index cfbee6f..8c8e39b 100644
--- a/core/Lucy/Index/SortFieldWriter.c
+++ b/core/Lucy/Index/SortFieldWriter.c
@@ -614,7 +614,7 @@ SortFieldWriter_Finish_IMP(SortFieldWriter *self) {
 
     int32_t  field_num = ivars->field_num;
     Folder  *folder    = PolyReader_Get_Folder(ivars->polyreader);
-    String *seg_name  = Seg_Get_Name(ivars->segment);
+    String  *seg_name  = Seg_Get_Name(ivars->segment);
 
     // Open streams.
     String *ord_path = Str_newf("%o/sort-%i32.ord", seg_name, field_num);

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Index/SortWriter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SortWriter.c b/core/Lucy/Index/SortWriter.c
index cdf5019..3adf9de 100644
--- a/core/Lucy/Index/SortWriter.c
+++ b/core/Lucy/Index/SortWriter.c
@@ -98,7 +98,7 @@ S_lazy_init_field_writer(SortWriter *self, int32_t field_num) {
 
         // Open temp files.
         if (!ivars->temp_ord_out) {
-            Folder  *folder   = ivars->folder;
+            Folder *folder   = ivars->folder;
             String *seg_name = Seg_Get_Name(ivars->segment);
             String *ord_path = Str_newf("%o/sort_ord_temp", seg_name);
             ivars->temp_ord_out = Folder_Open_Out(folder, ord_path);
@@ -240,7 +240,7 @@ SortWriter_Finish_IMP(SortWriter *self) {
                            (Obj*)SortWriter_Metadata(self));
 
     // Clean up.
-    Folder  *folder   = ivars->folder;
+    Folder *folder   = ivars->folder;
     String *seg_name = Seg_Get_Name(ivars->segment);
     String *ord_path = Str_newf("%o/sort_ord_temp", seg_name);
     Folder_Delete(folder, ord_path);

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Index/TermVector.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/TermVector.c b/core/Lucy/Index/TermVector.c
index 2666ceb..d8d292d 100644
--- a/core/Lucy/Index/TermVector.c
+++ b/core/Lucy/Index/TermVector.c
@@ -134,7 +134,7 @@ TV_Equals_IMP(TermVector *self, Obj *other) {
     TermVectorIVARS *const ovars = TV_IVARS((TermVector*)other);
     if (!Str_Equals(ivars->field, (Obj*)ovars->field)) { return false; }
     if (!Str_Equals(ivars->text, (Obj*)ovars->text))   { return false; }
-    if (ivars->num_pos != ovars->num_pos)             { return false; }
+    if (ivars->num_pos != ovars->num_pos)              { return false; }
 
     int32_t *const posits       = I32Arr_IVARS(ivars->positions)->ints;
     int32_t *const starts       = I32Arr_IVARS(ivars->start_offsets)->ints;

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Plan/Schema.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Plan/Schema.c b/core/Lucy/Plan/Schema.c
index 32a6ba2..8ce77d0 100644
--- a/core/Lucy/Plan/Schema.c
+++ b/core/Lucy/Plan/Schema.c
@@ -316,7 +316,7 @@ Schema_Load_IMP(Schema *self, Obj *dump) {
     VArray *analyzers
         = (VArray*)Freezer_load((Obj*)analyzer_dumps);
     String *field;
-    Hash    *type_dump;
+    Hash   *type_dump;
     UNUSED_VAR(self);
 
     // Start with a blank Schema.

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Plan/TextType.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Plan/TextType.c b/core/Lucy/Plan/TextType.c
index a602eb0..40d0490 100644
--- a/core/Lucy/Plan/TextType.c
+++ b/core/Lucy/Plan/TextType.c
@@ -89,10 +89,10 @@ TextTermStepper_Write_Delta_IMP(TextTermStepper *self, OutStream *outstream,
     TextTermStepperIVARS *const ivars = TextTermStepper_IVARS(self);
     String *new_value  = (String*)CERTIFY(value, STRING);
     String *last_value = (String*)ivars->value;
-    char    *new_text  = (char*)Str_Get_Ptr8(new_value);
-    size_t   new_size  = Str_Get_Size(new_value);
-    char    *last_text = (char*)Str_Get_Ptr8(last_value);
-    size_t   last_size = Str_Get_Size(last_value);
+    char   *new_text   = (char*)Str_Get_Ptr8(new_value);
+    size_t  new_size   = Str_Get_Size(new_value);
+    char   *last_text  = (char*)Str_Get_Ptr8(last_value);
+    size_t  last_size  = Str_Get_Size(last_value);
 
     // Count how many bytes the strings share at the top.
     const int32_t overlap = StrHelp_overlap(last_text, new_text,
@@ -119,7 +119,7 @@ TextTermStepper_Read_Key_Frame_IMP(TextTermStepper *self,
         ivars->value = (Obj*)Str_new(text_len);
     }
     String *value = (String*)ivars->value;
-    char *ptr      = Str_Grow(value, text_len);
+    char   *ptr   = Str_Grow(value, text_len);
 
     // Set the value text.
     InStream_Read_Bytes(instream, ptr, text_len);
@@ -146,7 +146,7 @@ TextTermStepper_Read_Delta_IMP(TextTermStepper *self, InStream *instream) {
         ivars->value = (Obj*)Str_new(total_text_len);
     }
     String *value = (String*)ivars->value;
-    char *ptr      = Str_Grow(value, total_text_len);
+    char   *ptr   = Str_Grow(value, total_text_len);
 
     // Set the value text.
     InStream_Read_Bytes(instream, ptr + text_overlap, finish_chars_len);

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Search/PhraseQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/PhraseQuery.c b/core/Lucy/Search/PhraseQuery.c
index af94c00..f66f141 100644
--- a/core/Lucy/Search/PhraseQuery.c
+++ b/core/Lucy/Search/PhraseQuery.c
@@ -86,7 +86,7 @@ PhraseQuery*
 PhraseQuery_Deserialize_IMP(PhraseQuery *self, InStream *instream) {
     float boost = InStream_Read_F32(instream);
     String *field = Freezer_read_charbuf(instream);
-    VArray  *terms = Freezer_read_varray(instream);
+    VArray *terms = Freezer_read_varray(instream);
     return S_do_init(self, field, terms, boost);
 }
 

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Search/QueryParser.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/QueryParser.c b/core/Lucy/Search/QueryParser.c
index 2a753f0..9728e55 100644
--- a/core/Lucy/Search/QueryParser.c
+++ b/core/Lucy/Search/QueryParser.c
@@ -199,8 +199,8 @@ QParser_Set_Heed_Colons_IMP(QueryParser *self, bool heed_colons) {
 Query*
 QParser_Parse_IMP(QueryParser *self, const String *query_string) {
     String *qstring = query_string
-                       ? Str_Clone(query_string)
-                       : Str_new_from_trusted_utf8("", 0);
+                      ? Str_Clone(query_string)
+                      : Str_new_from_trusted_utf8("", 0);
     Query *tree     = QParser_Tree(self, qstring);
     Query *expanded = QParser_Expand(self, tree);
     Query *pruned   = QParser_Prune(self, expanded);
@@ -890,7 +890,7 @@ QParser_Expand_Leaf_IMP(QueryParser *self, Query *query) {
     }
 
     String *unescaped = Str_new(SStr_Get_Size(source_text));
-    VArray  *queries   = VA_new(VA_Get_Size(fields));
+    VArray *queries   = VA_new(VA_Get_Size(fields));
     for (uint32_t i = 0, max = VA_Get_Size(fields); i < max; i++) {
         String   *field    = (String*)VA_Fetch(fields, i);
         Analyzer *analyzer = ivars->analyzer

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Search/QueryParser/QueryLexer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/QueryParser/QueryLexer.c b/core/Lucy/Search/QueryParser/QueryLexer.c
index 4c49c06..df2f965 100644
--- a/core/Lucy/Search/QueryParser/QueryLexer.c
+++ b/core/Lucy/Search/QueryParser/QueryLexer.c
@@ -74,8 +74,8 @@ VArray*
 QueryLexer_Tokenize_IMP(QueryLexer *self, const String *query_string) {
     QueryLexerIVARS *const ivars = QueryLexer_IVARS(self);
     String *copy = query_string
-                    ? Str_Clone(query_string)
-                    : Str_new_from_trusted_utf8("", 0);
+                   ? Str_Clone(query_string)
+                   : Str_new_from_trusted_utf8("", 0);
     StackString *qstring = SSTR_WRAP((String*)copy);
     VArray *elems = VA_new(0);
     SStr_Trim(qstring);

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Search/RangeQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/RangeQuery.c b/core/Lucy/Search/RangeQuery.c
index a0fe266..5afad80 100644
--- a/core/Lucy/Search/RangeQuery.c
+++ b/core/Lucy/Search/RangeQuery.c
@@ -77,16 +77,16 @@ RangeQuery_Destroy_IMP(RangeQuery *self) {
 
 bool
 RangeQuery_Equals_IMP(RangeQuery *self, Obj *other) {
-    if ((RangeQuery*)other == self)                   { return true; }
-    if (!Obj_Is_A(other, RANGEQUERY))                 { return false; }
+    if ((RangeQuery*)other == self)                    { return true; }
+    if (!Obj_Is_A(other, RANGEQUERY))                  { return false; }
     RangeQueryIVARS *const ivars = RangeQuery_IVARS(self);
     RangeQueryIVARS *const ovars = RangeQuery_IVARS((RangeQuery*)other);
-    if (ivars->boost != ovars->boost)                 { return false; }
+    if (ivars->boost != ovars->boost)                  { return false; }
     if (!Str_Equals(ivars->field, (Obj*)ovars->field)) { return false; }
-    if (ivars->lower_term && !ovars->lower_term)      { return false; }
-    if (ivars->upper_term && !ovars->upper_term)      { return false; }
-    if (!ivars->lower_term && ovars->lower_term)      { return false; }
-    if (!ivars->upper_term && ovars->upper_term)      { return false; }
+    if (ivars->lower_term && !ovars->lower_term)       { return false; }
+    if (ivars->upper_term && !ovars->upper_term)       { return false; }
+    if (!ivars->lower_term && ovars->lower_term)       { return false; }
+    if (!ivars->upper_term && ovars->upper_term)       { return false; }
     if (ivars->lower_term
         && !Obj_Equals(ivars->lower_term, ovars->lower_term)) { return false; }
     if (ivars->upper_term
@@ -100,11 +100,11 @@ String*
 RangeQuery_To_String_IMP(RangeQuery *self) {
     RangeQueryIVARS *const ivars = RangeQuery_IVARS(self);
     String *lower_term_str = ivars->lower_term
-                              ? Obj_To_String(ivars->lower_term)
-                              : Str_new_from_trusted_utf8("*", 1);
+                             ? Obj_To_String(ivars->lower_term)
+                             : Str_new_from_trusted_utf8("*", 1);
     String *upper_term_str = ivars->upper_term
-                              ? Obj_To_String(ivars->upper_term)
-                              : Str_new_from_trusted_utf8("*", 1);
+                             ? Obj_To_String(ivars->upper_term)
+                             : Str_new_from_trusted_utf8("*", 1);
     String *retval = Str_newf("%o:%s%o TO %o%s", ivars->field,
                               ivars->include_lower ? "[" : "{",
                               lower_term_str,

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Search/TermQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/TermQuery.c b/core/Lucy/Search/TermQuery.c
index 4167a54..feb8b8b 100644
--- a/core/Lucy/Search/TermQuery.c
+++ b/core/Lucy/Search/TermQuery.c
@@ -111,13 +111,13 @@ TermQuery_Get_Term_IMP(TermQuery *self) {
 
 bool
 TermQuery_Equals_IMP(TermQuery *self, Obj *other) {
-    if ((TermQuery*)other == self)                    { return true; }
-    if (!Obj_Is_A(other, TERMQUERY))                  { return false; }
+    if ((TermQuery*)other == self)                     { return true; }
+    if (!Obj_Is_A(other, TERMQUERY))                   { return false; }
     TermQueryIVARS *const ivars = TermQuery_IVARS(self);
     TermQueryIVARS *const ovars = TermQuery_IVARS((TermQuery*)other);
-    if (ivars->boost != ovars->boost)                 { return false; }
+    if (ivars->boost != ovars->boost)                  { return false; }
     if (!Str_Equals(ivars->field, (Obj*)ovars->field)) { return false; }
-    if (!Obj_Equals(ivars->term, ovars->term))        { return false; }
+    if (!Obj_Equals(ivars->term, ovars->term))         { return false; }
     return true;
 }
 

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Search/TermQuery.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/TermQuery.cfh b/core/Lucy/Search/TermQuery.cfh
index 5ec210d..a52437d 100644
--- a/core/Lucy/Search/TermQuery.cfh
+++ b/core/Lucy/Search/TermQuery.cfh
@@ -26,7 +26,7 @@ parcel Lucy;
 public class Lucy::Search::TermQuery inherits Lucy::Search::Query {
 
     String *field;
-    Obj     *term;
+    Obj    *term;
 
     inert incremented TermQuery*
     new(const String *field, const Obj *term);

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Store/CompoundFileReader.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/CompoundFileReader.c b/core/Lucy/Store/CompoundFileReader.c
index 21a292e..3955cfb 100644
--- a/core/Lucy/Store/CompoundFileReader.c
+++ b/core/Lucy/Store/CompoundFileReader.c
@@ -45,7 +45,7 @@ CFReader_do_open(CompoundFileReader *self, Folder *folder) {
     // Parse metadata file.
     if (!metadata || !Hash_Is_A(metadata, HASH)) {
         error = Err_new(Str_newf("Can't read '%o' in '%o'", cfmeta_file,
-                                Folder_Get_Path(folder)));
+                                 Folder_Get_Path(folder)));
     }
     else {
         Obj *format = Hash_Fetch_Str(metadata, "format", 6);
@@ -53,16 +53,16 @@ CFReader_do_open(CompoundFileReader *self, Folder *folder) {
         ivars->records = (Hash*)INCREF(Hash_Fetch_Str(metadata, "files", 5));
         if (ivars->format < 1) {
             error = Err_new(Str_newf("Corrupt %o file: Missing or invalid 'format'",
-                                    cfmeta_file));
+                                     cfmeta_file));
         }
         else if (ivars->format > CFWriter_current_file_format) {
             error = Err_new(Str_newf("Unsupported compound file format: %i32 "
-                                    "(current = %i32", ivars->format,
-                                    CFWriter_current_file_format));
+                                     "(current = %i32", ivars->format,
+                                     CFWriter_current_file_format));
         }
         else if (!ivars->records) {
             error = Err_new(Str_newf("Corrupt %o file: missing 'files' key",
-                                    cfmeta_file));
+                                     cfmeta_file));
         }
     }
     DECREF(metadata);
@@ -141,7 +141,7 @@ CFReader_Local_Open_FileHandle_IMP(CompoundFileReader *self,
 
     if (entry) {
         Err_set_error(Err_new(Str_newf("Can't open FileHandle for virtual file %o in '%o'",
-                                      name, ivars->path)));
+                                       name, ivars->path)));
     }
     else {
         fh = Folder_Local_Open_FileHandle(ivars->real_folder, name, flags);
@@ -197,7 +197,7 @@ CFReader_Local_Open_In_IMP(CompoundFileReader *self, const String *name) {
         Obj *offset = Hash_Fetch_Str(entry, "offset", 6);
         if (!len || !offset) {
             Err_set_error(Err_new(Str_newf("Malformed entry for '%o' in '%o'",
-                                          name, Folder_Get_Path(ivars->real_folder))));
+                                           name, Folder_Get_Path(ivars->real_folder))));
             return NULL;
         }
         else if (Str_Get_Size(ivars->path)) {

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Store/CompoundFileWriter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/CompoundFileWriter.c b/core/Lucy/Store/CompoundFileWriter.c
index e86868c..0cb9891 100644
--- a/core/Lucy/Store/CompoundFileWriter.c
+++ b/core/Lucy/Store/CompoundFileWriter.c
@@ -74,7 +74,7 @@ static void
 S_clean_up_old_temp_files(CompoundFileWriter *self,
                           CompoundFileWriterIVARS *ivars) {
     UNUSED_VAR(self);
-    Folder  *folder      = ivars->folder;
+    Folder *folder      = ivars->folder;
     String *cfmeta_temp = (String*)SSTR_WRAP_STR("cfmeta.json.temp", 16);
     String *cf_file     = (String*)SSTR_WRAP_STR("cf.dat", 6);
 
@@ -156,7 +156,7 @@ S_do_consolidate(CompoundFileWriter *self, CompoundFileWriterIVARS *ivars) {
     DECREF(metadata);
     /*
     String *merged_file;
-    Obj     *ignore;
+    Obj    *ignore;
     Hash_Iterate(sub_files);
     while (Hash_Next(sub_files, (Obj**)&merged_file, &ignore)) {
         if (!Folder_Delete(folder, merged_file)) {

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Store/FSDirHandle.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/FSDirHandle.c b/core/Lucy/Store/FSDirHandle.c
index c477dc4..631f2f6 100644
--- a/core/Lucy/Store/FSDirHandle.c
+++ b/core/Lucy/Store/FSDirHandle.c
@@ -79,7 +79,7 @@ FSDH_do_open(FSDirHandle *self, const String *dir) {
     if (dir_path_size >= MAX_PATH - 2) {
         // Deal with Windows ceiling on file path lengths.
         Err_set_error(Err_new(Str_newf("Directory path is too long: %o",
-                                      dir)));
+                                       dir)));
         CFISH_DECREF(self);
         return NULL;
     }
@@ -142,7 +142,7 @@ FSDH_Close_IMP(FSDirHandle *self) {
                 char *win_error = Err_win_error();
                 ivars->saved_error
                     = Err_new(Str_newf("Error while closing directory: %s",
-                                      win_error));
+                                       win_error));
                 FREEMEM(win_error);
             }
         }
@@ -183,7 +183,7 @@ FSDH_Next_IMP(FSDirHandle *self) {
             char *win_error = Err_win_error();
             ivars->saved_error
                 = Err_new(Str_newf("Error while traversing directory: %s",
-                                  win_error));
+                                   win_error));
             FREEMEM(win_error);
         }
         return false;
@@ -310,7 +310,7 @@ FSDH_Close_IMP(FSDirHandle *self) {
         ivars->sys_dirhandle = NULL;
         if (closedir(sys_dirhandle) == -1) {
             Err_set_error(Err_new(Str_newf("Error closing dirhandle: %s",
-                                          strerror(errno))));
+                                           strerror(errno))));
             return false;
         }
     }

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Store/FSFileHandle.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/FSFileHandle.c b/core/Lucy/Store/FSFileHandle.c
index 132ef80..5d10975 100644
--- a/core/Lucy/Store/FSFileHandle.c
+++ b/core/Lucy/Store/FSFileHandle.c
@@ -104,7 +104,7 @@ FSFH_do_open(FSFileHandle *self, const String *path, uint32_t flags) {
         if (ivars->fd == -1) {
             ivars->fd = 0;
             Err_set_error(Err_new(Str_newf("Attempt to open '%o' failed: %s",
-                                          path, strerror(errno))));
+                                           path, strerror(errno))));
             CFISH_DECREF(self);
             return NULL;
         }
@@ -116,7 +116,7 @@ FSFH_do_open(FSFileHandle *self, const String *path, uint32_t flags) {
             ivars->len = lseek64(ivars->fd, INT64_C(0), SEEK_END);
             if (ivars->len == -1) {
                 Err_set_error(Err_new(Str_newf("lseek64 on %o failed: %s",
-                                              ivars->path, strerror(errno))));
+                                               ivars->path, strerror(errno))));
                 CFISH_DECREF(self);
                 return NULL;
             }
@@ -124,7 +124,7 @@ FSFH_do_open(FSFileHandle *self, const String *path, uint32_t flags) {
                 int64_t check_val = lseek64(ivars->fd, INT64_C(0), SEEK_SET);
                 if (check_val == -1) {
                     Err_set_error(Err_new(Str_newf("lseek64 on %o failed: %s",
-                                                  ivars->path, strerror(errno))));
+                                                   ivars->path, strerror(errno))));
                     CFISH_DECREF(self);
                     return NULL;
                 }
@@ -151,7 +151,7 @@ FSFH_do_open(FSFileHandle *self, const String *path, uint32_t flags) {
     }
     else {
         Err_set_error(Err_new(Str_newf("Must specify FH_READ_ONLY or FH_WRITE_ONLY to open '%o'",
-                                      path)));
+                                       path)));
         CFISH_DECREF(self);
         return NULL;
     }
@@ -173,7 +173,7 @@ FSFH_Close_IMP(FSFileHandle *self) {
     if (ivars->fd) {
         if (close(ivars->fd)) {
             Err_set_error(Err_new(Str_newf("Failed to close file: %s",
-                                          strerror(errno))));
+                                           strerror(errno))));
             return false;
         }
         ivars->fd  = 0;
@@ -198,11 +198,11 @@ FSFH_Write_IMP(FSFileHandle *self, const void *data, size_t len) {
         if ((size_t)check_val != len) {
             if (check_val == -1) {
                 Err_set_error(Err_new(Str_newf("Error when writing %u64 bytes: %s",
-                                              (uint64_t)len, strerror(errno))));
+                                               (uint64_t)len, strerror(errno))));
             }
             else {
                 Err_set_error(Err_new(Str_newf("Attempted to write %u64 bytes, but wrote %i64",
-                                              (uint64_t)len, check_val)));
+                                               (uint64_t)len, check_val)));
             }
             return false;
         }
@@ -227,12 +227,12 @@ FSFH_Window_IMP(FSFileHandle *self, FileWindow *window, int64_t offset,
     }
     else if (offset < 0) {
         Err_set_error(Err_new(Str_newf("Can't read from negative offset %i64",
-                                      offset)));
+                                       offset)));
         return false;
     }
     else if (end > ivars->len) {
         Err_set_error(Err_new(Str_newf("Tried to read past EOF: offset %i64 + request %i64 > len %i64",
-                                      offset, len, ivars->len)));
+                                       offset, len, ivars->len)));
         return false;
     }
     else {
@@ -270,12 +270,12 @@ FSFH_Read_IMP(FSFileHandle *self, char *dest, int64_t offset, size_t len) {
     }
     if (offset < 0) {
         Err_set_error(Err_new(Str_newf("Can't read from an offset less than 0 (%i64)",
-                                      offset)));
+                                       offset)));
         return false;
     }
     else if (end > ivars->len) {
         Err_set_error(Err_new(Str_newf("Tried to read past EOF: offset %i64 + request %u64 > len %i64",
-                                      offset, (uint64_t)len, ivars->len)));
+                                       offset, (uint64_t)len, ivars->len)));
         return false;
     }
     memcpy(dest, ivars->buf + offset, len);
@@ -335,7 +335,7 @@ SI_init_read_only(FSFileHandle *self, FSFileHandleIVARS *ivars) {
     if (ivars->fd == -1) {
         ivars->fd = 0;
         Err_set_error(Err_new(Str_newf("Can't open '%o': %s", ivars->path,
-                                      strerror(errno))));
+                                       strerror(errno))));
         return false;
     }
 
@@ -343,14 +343,14 @@ SI_init_read_only(FSFileHandle *self, FSFileHandleIVARS *ivars) {
     ivars->len = lseek64(ivars->fd, INT64_C(0), SEEK_END);
     if (ivars->len == -1) {
         Err_set_error(Err_new(Str_newf("lseek64 on %o failed: %s", ivars->path,
-                                      strerror(errno))));
+                                       strerror(errno))));
         return false;
     }
     else {
         int64_t check_val = lseek64(ivars->fd, INT64_C(0), SEEK_SET);
         if (check_val == -1) {
             Err_set_error(Err_new(Str_newf("lseek64 on %o failed: %s",
-                                          ivars->path, strerror(errno))));
+                                           ivars->path, strerror(errno))));
             return false;
         }
     }
@@ -378,9 +378,9 @@ SI_map(FSFileHandle *self, FSFileHandleIVARS *ivars, int64_t offset,
         buf = mmap(NULL, len, PROT_READ, MAP_SHARED, ivars->fd, offset);
         if (buf == (void*)(-1)) {
             Err_set_error(Err_new(Str_newf("mmap of offset %i64 and length %i64 (page size %i64) "
-                                          "against '%o' failed: %s",
-                                          offset, len, ivars->page_size,
-                                          ivars->path, strerror(errno))));
+                                           "against '%o' failed: %s",
+                                           offset, len, ivars->page_size,
+                                           ivars->path, strerror(errno))));
             return NULL;
         }
     }
@@ -393,8 +393,8 @@ SI_unmap(FSFileHandle *self, char *buf, int64_t len) {
     if (buf != NULL) {
         if (munmap(buf, len)) {
             Err_set_error(Err_new(Str_newf("Failed to munmap '%o': %s",
-                                          FSFH_IVARS(self)->path,
-                                          strerror(errno))));
+                                           FSFH_IVARS(self)->path,
+                                           strerror(errno))));
             return false;
         }
     }
@@ -410,7 +410,7 @@ FSFH_Read_IMP(FSFileHandle *self, char *dest, int64_t offset, size_t len) {
     // Sanity check.
     if (offset < 0) {
         Err_set_error(Err_new(Str_newf("Can't read from an offset less than 0 (%i64)",
-                                      offset)));
+                                       offset)));
         return false;
     }
 
@@ -419,11 +419,11 @@ FSFH_Read_IMP(FSFileHandle *self, char *dest, int64_t offset, size_t len) {
     if (check_val != (int64_t)len) {
         if (check_val == -1) {
             Err_set_error(Err_new(Str_newf("Tried to read %u64 bytes, got %i64: %s",
-                                          (uint64_t)len, check_val, strerror(errno))));
+                                           (uint64_t)len, check_val, strerror(errno))));
         }
         else {
             Err_set_error(Err_new(Str_newf("Tried to read %u64 bytes, got %i64",
-                                          (uint64_t)len, check_val)));
+                                           (uint64_t)len, check_val)));
         }
         return false;
     }
@@ -458,7 +458,7 @@ SI_init_read_only(FSFileHandle *self, FSFileHandleIVARS *ivars) {
     if (ivars->win_fhandle == INVALID_HANDLE_VALUE) {
         char *win_error = Err_win_error();
         Err_set_error(Err_new(Str_newf("CreateFile for %o failed: %s",
-                                      ivars->path, win_error)));
+                                       ivars->path, win_error)));
         FREEMEM(win_error);
         return false;
     }
@@ -468,7 +468,7 @@ SI_init_read_only(FSFileHandle *self, FSFileHandleIVARS *ivars) {
     DWORD file_size_lo = GetFileSize(ivars->win_fhandle, &file_size_hi);
     if (file_size_lo == INVALID_FILE_SIZE && GetLastError() != NO_ERROR) {
         Err_set_error(Err_new(Str_newf("GetFileSize for %o failed",
-                                      ivars->path)));
+                                       ivars->path)));
         return false;
     }
     ivars->len = ((uint64_t)file_size_hi << 32) | file_size_lo;
@@ -481,7 +481,7 @@ SI_init_read_only(FSFileHandle *self, FSFileHandleIVARS *ivars) {
         if (ivars->win_maphandle == NULL) {
             char *win_error = Err_win_error();
             Err_set_error(Err_new(Str_newf("CreateFileMapping for %o failed: %s",
-                                          ivars->path, win_error)));
+                                           ivars->path, win_error)));
             FREEMEM(win_error);
             return false;
         }
@@ -506,7 +506,7 @@ SI_map(FSFileHandle *self, FSFileHandleIVARS *ivars, int64_t offset,
         if (buf == NULL) {
             char *win_error = Err_win_error();
             Err_set_error(Err_new(Str_newf("MapViewOfFile for %o failed: %s",
-                                          ivars->path, win_error)));
+                                           ivars->path, win_error)));
             FREEMEM(win_error);
         }
     }
@@ -520,8 +520,8 @@ SI_unmap(FSFileHandle *self, char *ptr, int64_t len) {
         if (!UnmapViewOfFile(buf)) {
             char *win_error = Err_win_error();
             Err_set_error(Err_new(Str_newf("Failed to unmap '%o': %s",
-                                          FSFH_IVARS(self)->path,
-                                          win_error)));
+                                           FSFH_IVARS(self)->path,
+                                           win_error)));
             FREEMEM(win_error);
             return false;
         }
@@ -537,7 +537,7 @@ SI_close_win_handles(FSFileHandle *self) {
         if (!CloseHandle(ivars->win_maphandle)) {
             char *win_error = Err_win_error();
             Err_set_error(Err_new(Str_newf("Failed to close file mapping handle: %s",
-                                          win_error)));
+                                           win_error)));
             FREEMEM(win_error);
             return false;
         }
@@ -547,7 +547,7 @@ SI_close_win_handles(FSFileHandle *self) {
         if (!CloseHandle(ivars->win_fhandle)) {
             char *win_error = Err_win_error();
             Err_set_error(Err_new(Str_newf("Failed to close file handle: %s",
-                                          win_error)));
+                                           win_error)));
             FREEMEM(win_error);
             return false;
         }
@@ -573,7 +573,7 @@ FSFH_Read_IMP(FSFileHandle *self, char *dest, int64_t offset, size_t len) {
     // Sanity check.
     if (offset < 0) {
         Err_set_error(Err_new(Str_newf("Can't read from an offset less than 0 (%i64)",
-                                      offset)));
+                                       offset)));
         return false;
     }
 
@@ -581,7 +581,7 @@ FSFH_Read_IMP(FSFileHandle *self, char *dest, int64_t offset, size_t len) {
     // argument, so throw a sensible error rather than wrap around.
     if (len > UINT32_MAX) {
         Err_set_error(Err_new(Str_newf("Can't read more than 4 GB (%u64)",
-                                      (uint64_t)len)));
+                                       (uint64_t)len)));
         return false;
     }
 
@@ -599,7 +599,7 @@ FSFH_Read_IMP(FSFileHandle *self, char *dest, int64_t offset, size_t len) {
     if (!check_val) {
         char *win_error = Err_win_error();
         Err_set_error(Err_new(Str_newf("Failed to read %u64 bytes: %s",
-                                      (uint64_t)len, win_error)));
+                                       (uint64_t)len, win_error)));
         FREEMEM(win_error);
         return false;
     }

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Store/FSFolder.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/FSFolder.c b/core/Lucy/Store/FSFolder.c
index 082783d..f7d777f 100644
--- a/core/Lucy/Store/FSFolder.c
+++ b/core/Lucy/Store/FSFolder.c
@@ -173,11 +173,11 @@ bool
 FSFolder_Rename_IMP(FSFolder *self, const String* from, const String *to) {
     String *from_path = S_fullpath(self, from);
     String *to_path   = S_fullpath(self, to);
-    bool     retval    = !rename((char*)Str_Get_Ptr8(from_path),
+    bool    retval    = !rename((char*)Str_Get_Ptr8(from_path),
                                  (char*)Str_Get_Ptr8(to_path));
     if (!retval) {
         Err_set_error(Err_new(Str_newf("rename from '%o' to '%o' failed: %s",
-                                      from_path, to_path, strerror(errno))));
+                                       from_path, to_path, strerror(errno))));
     }
     DECREF(from_path);
     DECREF(to_path);
@@ -189,7 +189,7 @@ FSFolder_Hard_Link_IMP(FSFolder *self, const String *from,
                        const String *to) {
     String *from_path = S_fullpath(self, from);
     String *to_path   = S_fullpath(self, to);
-    bool     retval    = S_hard_link(from_path, to_path);
+    bool    retval    = S_hard_link(from_path, to_path);
     DECREF(from_path);
     DECREF(to_path);
     return retval;
@@ -200,7 +200,7 @@ FSFolder_Local_Delete_IMP(FSFolder *self, const String *name) {
     FSFolderIVARS *const ivars = FSFolder_IVARS(self);
 
     String *fullpath = S_fullpath(self, name);
-    char    *path_ptr = (char*)Str_Get_Ptr8(fullpath);
+    char   *path_ptr = (char*)Str_Get_Ptr8(fullpath);
 #ifdef CHY_REMOVE_ZAPS_DIRS
     bool result = !remove(path_ptr);
 #else
@@ -289,7 +289,7 @@ static bool
 S_create_dir(const String *path) {
     if (-1 == chy_makedir((char*)Str_Get_Ptr8(path), 0777)) {
         Err_set_error(Err_new(Str_newf("Couldn't create directory '%o': %s",
-                                      path, strerror(errno))));
+                                       path, strerror(errno))));
         return false;
     }
     return true;
@@ -356,7 +356,7 @@ S_hard_link(String *from_path, String *to_path) {
     else {
         char *win_error = Err_win_error();
         Err_set_error(Err_new(Str_newf("CreateHardLink for new file '%o' from '%o' failed: %s",
-                                      to_path, from_path, win_error)));
+                                       to_path, from_path, win_error)));
         FREEMEM(win_error);
         return false;
     }
@@ -388,7 +388,7 @@ S_hard_link(String *from_path, String *to_path) {
 
     if (-1 == link(from8, to8)) {
         Err_set_error(Err_new(Str_newf("hard link for new file '%o' from '%o' failed: %s",
-                                      to_path, from_path, strerror(errno))));
+                                       to_path, from_path, strerror(errno))));
         return false;
     }
     else {

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Store/Folder.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/Folder.c b/core/Lucy/Store/Folder.c
index 5a3c815..4a97db2 100644
--- a/core/Lucy/Store/Folder.c
+++ b/core/Lucy/Store/Folder.c
@@ -226,8 +226,8 @@ S_add_to_file_list(Folder *self, VArray *list, String *dir,
         String *entry = DH_Get_Entry(dh);
         if (!S_is_updir(entry)) {
             String *relpath = path && Str_Get_Size(path)
-                               ? Str_newf("%o/%o", path, entry)
-                               : Str_Clone(entry);
+                              ? Str_newf("%o/%o", path, entry)
+                              : Str_Clone(entry);
             if (VA_Get_Size(list) == VA_Get_Capacity(list)) {
                 VA_Grow(list, VA_Get_Size(list) * 2);
             }
@@ -235,8 +235,8 @@ S_add_to_file_list(Folder *self, VArray *list, String *dir,
 
             if (DH_Entry_Is_Dir(dh) && !DH_Entry_Is_Symlink(dh)) {
                 String *subdir = Str_Get_Size(dir)
-                                  ? Str_newf("%o/%o", dir, entry)
-                                  : Str_Clone(entry);
+                                 ? Str_newf("%o/%o", dir, entry)
+                                 : Str_Clone(entry);
                 S_add_to_file_list(self, list, subdir, relpath); // recurse
                 DECREF(subdir);
             }
@@ -283,7 +283,7 @@ Folder_MkDir_IMP(Folder *self, const String *path) {
     }
     else if (!enclosing_folder) {
         Err_set_error(Err_new(Str_newf("Can't recursively create dir %o",
-                                      path)));
+                                       path)));
     }
     else {
         StackString *name = IxFileNames_local_part(path, SStr_BLANK());

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Store/Folder.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/Folder.cfh b/core/Lucy/Store/Folder.cfh
index 117beb5..dbb1b4e 100644
--- a/core/Lucy/Store/Folder.cfh
+++ b/core/Lucy/Store/Folder.cfh
@@ -29,7 +29,7 @@ parcel Lucy;
 public abstract class Lucy::Store::Folder inherits Clownfish::Obj {
 
     String *path;
-    Hash    *entries;
+    Hash   *entries;
 
     public inert nullable Folder*
     init(Folder *self, const String *path);

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Store/InStream.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/InStream.c b/core/Lucy/Store/InStream.c
index df23f73..cb975ce 100644
--- a/core/Lucy/Store/InStream.c
+++ b/core/Lucy/Store/InStream.c
@@ -76,7 +76,7 @@ InStream_do_open(InStream *self, Obj *file) {
     }
     else {
         Err_set_error(Err_new(Str_newf("Invalid type for param 'file': '%o'",
-                                      Obj_Get_Class_Name(file))));
+                                       Obj_Get_Class_Name(file))));
         DECREF(self);
         return NULL;
     }

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Store/Lock.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/Lock.c b/core/Lucy/Store/Lock.c
index c30493e..18e965a 100644
--- a/core/Lucy/Store/Lock.c
+++ b/core/Lucy/Store/Lock.c
@@ -142,7 +142,7 @@ LFLock_Request_IMP(LockFileLock *self) {
 
     if (Folder_Exists(ivars->folder, ivars->lock_path)) {
         Err_set_error((Err*)LockErr_new(Str_newf("Can't obtain lock: '%o' exists",
-                                                ivars->lock_path)));
+                                                 ivars->lock_path)));
         return false;
     }
 
@@ -152,7 +152,7 @@ LFLock_Request_IMP(LockFileLock *self) {
         if (!Folder_MkDir(ivars->folder, lock_dir_name)) {
             Err *mkdir_err = (Err*)CERTIFY(Err_get_error(), ERR);
             LockErr *err = LockErr_new(Str_newf("Can't create 'locks' directory: %o",
-                                               Err_Get_Mess(mkdir_err)));
+                                                Err_Get_Mess(mkdir_err)));
             // Maybe our attempt failed because another process succeeded.
             if (Folder_Find_Folder(ivars->folder, lock_dir_name)) {
                 DECREF(err);
@@ -182,16 +182,16 @@ LFLock_Request_IMP(LockFileLock *self) {
         if (!success) {
             Err *hard_link_err = (Err*)CERTIFY(Err_get_error(), ERR);
             Err_set_error((Err*)LockErr_new(Str_newf("Failed to obtain lock at '%o': %o",
-                                                    ivars->lock_path,
-                                                    Err_Get_Mess(hard_link_err))));
+                                                     ivars->lock_path,
+                                                     Err_Get_Mess(hard_link_err))));
         }
         deletion_failed = !Folder_Delete(ivars->folder, ivars->link_path);
     }
     else {
         Err *spew_json_err = (Err*)CERTIFY(Err_get_error(), ERR);
         Err_set_error((Err*)LockErr_new(Str_newf("Failed to obtain lock at '%o': %o",
-                                                ivars->lock_path,
-                                                Err_Get_Mess(spew_json_err))));
+                                                 ivars->lock_path,
+                                                 Err_Get_Mess(spew_json_err))));
     }
     DECREF(file_data);
 

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Store/OutStream.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/OutStream.c b/core/Lucy/Store/OutStream.c
index 64fd86e..98c6077 100644
--- a/core/Lucy/Store/OutStream.c
+++ b/core/Lucy/Store/OutStream.c
@@ -67,7 +67,7 @@ OutStream_do_open(OutStream *self, Obj *file) {
     }
     else {
         Err_set_error(Err_new(Str_newf("Invalid type for param 'file': '%o'",
-                                      Obj_Get_Class_Name(file))));
+                                       Obj_Get_Class_Name(file))));
         DECREF(self);
         return NULL;
     }

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Store/RAMFileHandle.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/RAMFileHandle.c b/core/Lucy/Store/RAMFileHandle.c
index 1b37503..5178f6f 100644
--- a/core/Lucy/Store/RAMFileHandle.c
+++ b/core/Lucy/Store/RAMFileHandle.c
@@ -88,12 +88,12 @@ RAMFH_Window_IMP(RAMFileHandle *self, FileWindow *window, int64_t offset,
     }
     else if (offset < 0) {
         Err_set_error(Err_new(Str_newf("Can't read from negative offset %i64",
-                                      offset)));
+                                       offset)));
         return false;
     }
     else if (end > ivars->len) {
         Err_set_error(Err_new(Str_newf("Tried to read past EOF: offset %i64 + request %i64 > len %i64",
-                                      offset, len, ivars->len)));
+                                       offset, len, ivars->len)));
         return false;
     }
     else {
@@ -120,12 +120,12 @@ RAMFH_Read_IMP(RAMFileHandle *self, char *dest, int64_t offset, size_t len) {
     }
     else if (offset < 0) {
         Err_set_error(Err_new(Str_newf("Can't read from a negative offset %i64",
-                                      offset)));
+                                       offset)));
         return false;
     }
     else if (end > ivars->len) {
         Err_set_error(Err_new(Str_newf("Attempt to read %u64 bytes starting at %i64 goes past EOF %u64",
-                                      (uint64_t)len, offset, ivars->len)));
+                                       (uint64_t)len, offset, ivars->len)));
         return false;
     }
     else {
@@ -152,12 +152,12 @@ RAMFH_Grow_IMP(RAMFileHandle *self, int64_t len) {
     RAMFileHandleIVARS *const ivars = RAMFH_IVARS(self);
     if (len > INT32_MAX) {
         Err_set_error(Err_new(Str_newf("Can't support RAM files of size %i64 (> %i32)",
-                                      len, (int32_t)INT32_MAX)));
+                                       len, (int32_t)INT32_MAX)));
         return false;
     }
     else if (ivars->flags & FH_READ_ONLY) {
         Err_set_error(Err_new(Str_newf("Can't grow read-only RAMFile '%o'",
-                                      ivars->path)));
+                                       ivars->path)));
         return false;
     }
     else {

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Store/RAMFolder.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/RAMFolder.c b/core/Lucy/Store/RAMFolder.c
index f8030c6..f2b2dd4 100644
--- a/core/Lucy/Store/RAMFolder.c
+++ b/core/Lucy/Store/RAMFolder.c
@@ -58,7 +58,7 @@ RAMFolder_Local_MkDir_IMP(RAMFolder *self, const String *name) {
     RAMFolderIVARS *const ivars = RAMFolder_IVARS(self);
     if (Hash_Fetch(ivars->entries, (Obj*)name)) {
         Err_set_error(Err_new(Str_newf("Can't MkDir, '%o' already exists",
-                                      name)));
+                                       name)));
         return false;
     }
     else {
@@ -155,7 +155,7 @@ S_rename_or_hard_link(RAMFolder *self, const String* from, const String *to,
     }
     if (!to_folder) {
         Err_set_error(Err_new(Str_newf("Invalid file path (can't find dir): '%o'",
-                                      to)));
+                                       to)));
         return false;
     }
 
@@ -176,12 +176,12 @@ S_rename_or_hard_link(RAMFolder *self, const String* from, const String *to,
     }
     if (!RAMFolder_Is_A(inner_from_folder, RAMFOLDER)) {
         Err_set_error(Err_new(Str_newf("Not a RAMFolder, but a '%o'",
-                                      Obj_Get_Class_Name((Obj*)inner_from_folder))));
+                                       Obj_Get_Class_Name((Obj*)inner_from_folder))));
         return false;
     }
     if (!RAMFolder_Is_A(inner_to_folder, RAMFOLDER)) {
         Err_set_error(Err_new(Str_newf("Not a RAMFolder, but a '%o'",
-                                      Obj_Get_Class_Name((Obj*)inner_to_folder))));
+                                       Obj_Get_Class_Name((Obj*)inner_to_folder))));
         return false;
     }
 
@@ -193,7 +193,7 @@ S_rename_or_hard_link(RAMFolder *self, const String* from, const String *to,
             && Folder_Local_Exists(from_folder, (String*)from_name)
            ) {
             Err_set_error(Err_new(Str_newf("Source file '%o' is virtual",
-                                          from)));
+                                           from)));
         }
         else {
             Err_set_error(Err_new(Str_newf("File not found: '%o'", from)));
@@ -228,8 +228,8 @@ S_rename_or_hard_link(RAMFolder *self, const String* from, const String *to,
             }
             if (conflict) {
                 Err_set_error(Err_new(Str_newf("Can't clobber a %o with a %o",
-                                              Obj_Get_Class_Name(existing),
-                                              Obj_Get_Class_Name(elem))));
+                                               Obj_Get_Class_Name(existing),
+                                               Obj_Get_Class_Name(elem))));
                 return false;
             }
         }
@@ -249,7 +249,7 @@ S_rename_or_hard_link(RAMFolder *self, const String* from, const String *to,
     else if (op == OP_HARD_LINK) {
         if (!Obj_Is_A(elem, RAMFILE)) {
             Err_set_error(Err_new(Str_newf("'%o' isn't a file, it's a %o",
-                                          from, Obj_Get_Class_Name(elem))));
+                                           from, Obj_Get_Class_Name(elem))));
             return false;
         }
         else {

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Store/SharedLock.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/SharedLock.c b/core/Lucy/Store/SharedLock.c
index d9c6c5a..a49b661 100644
--- a/core/Lucy/Store/SharedLock.c
+++ b/core/Lucy/Store/SharedLock.c
@@ -66,7 +66,7 @@ ShLock_Request_IMP(SharedLock *self) {
        ) {
         // Don't allow double obtain.
         Err_set_error((Err*)LockErr_new(Str_newf("Lock already obtained via '%o'",
-                                                ivars->lock_path)));
+                                                 ivars->lock_path)));
         return false;
     }
 

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Test/Analysis/TestNormalizer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Analysis/TestNormalizer.c b/core/Lucy/Test/Analysis/TestNormalizer.c
index 0de41ed..1fb45f4 100644
--- a/core/Lucy/Test/Analysis/TestNormalizer.c
+++ b/core/Lucy/Test/Analysis/TestNormalizer.c
@@ -90,7 +90,7 @@ test_normalization(TestBatchRunner *runner) {
         VArray *norms = (VArray*)Hash_Fetch_Str(test, "norms", 5);
         for (uint32_t j = 0, max = VA_Get_Size(words); j < max; j++) {
             String *word = (String*)VA_Fetch(words, j);
-            VArray  *got  = Normalizer_Split(normalizer, word);
+            VArray *got  = Normalizer_Split(normalizer, word);
             String *norm = (String*)VA_Fetch(got, 0);
             TEST_TRUE(runner,
                       norm

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Test/Analysis/TestSnowballStemmer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Analysis/TestSnowballStemmer.c b/core/Lucy/Test/Analysis/TestSnowballStemmer.c
index 572ddae..894c6e4 100644
--- a/core/Lucy/Test/Analysis/TestSnowballStemmer.c
+++ b/core/Lucy/Test/Analysis/TestSnowballStemmer.c
@@ -76,7 +76,7 @@ test_stemming(TestBatchRunner *runner) {
         SnowballStemmer *stemmer = SnowStemmer_new(iso);
         for (uint32_t i = 0, max = VA_Get_Size(words); i < max; i++) {
             String *word  = (String*)VA_Fetch(words, i);
-            VArray  *got   = SnowStemmer_Split(stemmer, word);
+            VArray *got   = SnowStemmer_Split(stemmer, word);
             String *stem  = (String*)VA_Fetch(got, 0);
             TEST_TRUE(runner,
                       stem

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Test/Highlight/TestHighlighter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Highlight/TestHighlighter.c b/core/Lucy/Test/Highlight/TestHighlighter.c
index 1128e84..8b3d2e5 100644
--- a/core/Lucy/Test/Highlight/TestHighlighter.c
+++ b/core/Lucy/Test/Highlight/TestHighlighter.c
@@ -315,8 +315,8 @@ test_Create_Excerpt(TestBatchRunner *runner, Searcher *searcher, Obj *query,
     String *excerpt = Highlighter_Create_Excerpt(highlighter, hit);
     TEST_TRUE(runner,
               Str_Find_Str(excerpt,
-                          "<strong>&#934;</strong> a b c d <strong>x y z</strong>",
-                          54) >= 0,
+                           "<strong>&#934;</strong> a b c d <strong>x y z</strong>",
+                           54) >= 0,
               "highlighter tagged phrase and single term");
     DECREF(excerpt);
 

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Test/Search/TestQueryParser.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestQueryParser.cfh b/core/Lucy/Test/Search/TestQueryParser.cfh
index d4e5969..c5296e5 100644
--- a/core/Lucy/Test/Search/TestQueryParser.cfh
+++ b/core/Lucy/Test/Search/TestQueryParser.cfh
@@ -22,7 +22,7 @@ parcel TestLucy;
 class Lucy::Test::Search::TestQueryParser cnick TestQP
     inherits Clownfish::Obj {
 
-    String *query_string;
+    String  *query_string;
     Query   *tree;
     Query   *expanded;
     uint32_t num_hits;

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Test/Search/TestQueryParserLogic.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestQueryParserLogic.c b/core/Lucy/Test/Search/TestQueryParserLogic.c
index d60058c..6083fac 100644
--- a/core/Lucy/Test/Search/TestQueryParserLogic.c
+++ b/core/Lucy/Test/Search/TestQueryParserLogic.c
@@ -940,8 +940,8 @@ TestQPLogic_Run_IMP(TestQueryParserLogic *self, TestBatchRunner *runner) {
         TestQueryParser *test_case_obj = test_func();
         TestQueryParserIVARS *test_case = TestQP_IVARS(test_case_obj);
         String *qstring = test_case->tree
-                           ? Query_To_String(test_case->tree)
-                           : Str_new_from_trusted_utf8("(NULL)", 6);
+                          ? Query_To_String(test_case->tree)
+                          : Str_new_from_trusted_utf8("(NULL)", 6);
         Query *tree = test_case->tree;
         Query *wanted = test_case->expanded;
         Query *pruned   = QParser_Prune(or_parser, tree);

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Test/Search/TestQueryParserSyntax.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestQueryParserSyntax.c b/core/Lucy/Test/Search/TestQueryParserSyntax.c
index b07799b..a4a180e 100644
--- a/core/Lucy/Test/Search/TestQueryParserSyntax.c
+++ b/core/Lucy/Test/Search/TestQueryParserSyntax.c
@@ -79,7 +79,7 @@ build_index() {
     FullTextType *fancy = FullTextType_new((Analyzer*)fancy_analyzer);
 
     // Schema.
-    Schema  *schema   = Schema_new();
+    Schema *schema   = Schema_new();
     String *plain_cb = Str_newf("plain");
     String *fancy_cb = Str_newf("fancy");
     Schema_Spec_Field(schema, plain_cb, (FieldType*)plain);

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Test/TestUtils.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/TestUtils.c b/core/Lucy/Test/TestUtils.c
index f2f1adf..199387f 100644
--- a/core/Lucy/Test/TestUtils.c
+++ b/core/Lucy/Test/TestUtils.c
@@ -104,8 +104,8 @@ LeafQuery*
 TestUtils_make_leaf_query(const char *field, const char *term) {
     String *term_cb  = (String*)SSTR_WRAP_STR(term, strlen(term));
     String *field_cb = field
-                        ? (String*)SSTR_WRAP_STR(field, strlen(field))
-                        : NULL;
+                       ? (String*)SSTR_WRAP_STR(field, strlen(field))
+                       : NULL;
     return LeafQuery_new(field_cb, term_cb);
 }
 

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Util/Freezer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Util/Freezer.c b/core/Lucy/Util/Freezer.c
index ff566df..8acf038 100644
--- a/core/Lucy/Util/Freezer.c
+++ b/core/Lucy/Util/Freezer.c
@@ -330,7 +330,7 @@ Freezer_deserialize_hash(Hash *hash, InStream *instream) {
     uint32_t size         = InStream_Read_C32(instream);
     uint32_t num_charbufs = InStream_Read_C32(instream);
     uint32_t num_other    = size - num_charbufs;
-    String *key          = num_charbufs ? Str_new(0) : NULL;
+    String *key           = num_charbufs ? Str_new(0) : NULL;
 
     Hash_init(hash, size);
 

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/Lucy/Util/Json.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Util/Json.c b/core/Lucy/Util/Json.c
index e55e406..674ff32 100644
--- a/core/Lucy/Util/Json.c
+++ b/core/Lucy/Util/Json.c
@@ -143,7 +143,7 @@ Json_to_json(Obj *dump) {
         if (!tolerant) {
             String *class_name = dump ? Obj_Get_Class_Name(dump) : NULL;
             String *mess = MAKE_MESS("Illegal top-level object type: %o",
-                                      class_name);
+                                     class_name);
             Err_set_error(Err_new(mess));
             return NULL;
         }
@@ -668,7 +668,7 @@ S_set_error(String *mess, char *json, char *limit, int line,
             const char *func) {
     if (func) {
         Str_catf(mess, " at %s %s line %i32 near ", func, __FILE__,
-                (int32_t)line);
+                 (int32_t)line);
     }
     else {
         Str_catf(mess, " at %s line %i32 near ", __FILE__, (int32_t)line);

http://git-wip-us.apache.org/repos/asf/lucy/blob/a3f930c8/core/LucyX/Search/ProximityQuery.c
----------------------------------------------------------------------
diff --git a/core/LucyX/Search/ProximityQuery.c b/core/LucyX/Search/ProximityQuery.c
index 6ae2875..a96c44d 100644
--- a/core/LucyX/Search/ProximityQuery.c
+++ b/core/LucyX/Search/ProximityQuery.c
@@ -91,7 +91,7 @@ ProximityQuery*
 ProximityQuery_Deserialize_IMP(ProximityQuery *self, InStream *instream) {
     float boost = InStream_Read_F32(instream);
     String *field = Freezer_read_charbuf(instream);
-    VArray  *terms = Freezer_read_varray(instream);
+    VArray *terms = Freezer_read_varray(instream);
     uint32_t within = InStream_Read_C32(instream);
     return S_do_init(self, field, terms, boost, within);
 }


Mime
View raw message