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 2013/09/14 21:29:44 UTC
[lucy-commits] [12/15] git commit: refs/heads/cfish-string-prep1 - Replace
*_Dec_RefCount with DECREF
Replace *_Dec_RefCount with DECREF
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/6f48dc35
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/6f48dc35
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/6f48dc35
Branch: refs/heads/cfish-string-prep1
Commit: 6f48dc3541dfed4fa7beef1f5ba48870f376bbaa
Parents: c798605
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Fri May 10 18:51:46 2013 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Sat Sep 14 20:36:20 2013 +0200
----------------------------------------------------------------------
core/Lucy/Index/Snapshot.c | 2 +-
core/Lucy/Index/SortCache/NumericSortCache.c | 4 ++--
core/Lucy/Index/SortCache/TextSortCache.c | 6 +++---
core/Lucy/Index/SortReader.c | 8 ++++----
core/Lucy/Search/PolyQuery.c | 2 +-
core/Lucy/Store/CompoundFileReader.c | 4 ++--
core/Lucy/Store/RAMDirHandle.c | 4 ++--
7 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/6f48dc35/core/Lucy/Index/Snapshot.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Snapshot.c b/core/Lucy/Index/Snapshot.c
index a8b2afe..fd9f546 100644
--- a/core/Lucy/Index/Snapshot.c
+++ b/core/Lucy/Index/Snapshot.c
@@ -70,7 +70,7 @@ Snapshot_Delete_Entry_IMP(Snapshot *self, const String *entry) {
SnapshotIVARS *const ivars = Snapshot_IVARS(self);
Obj *val = Hash_Delete(ivars->entries, (Obj*)entry);
if (val) {
- Obj_Dec_RefCount(val);
+ DECREF(val);
return true;
}
else {
http://git-wip-us.apache.org/repos/asf/lucy/blob/6f48dc35/core/Lucy/Index/SortCache/NumericSortCache.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SortCache/NumericSortCache.c b/core/Lucy/Index/SortCache/NumericSortCache.c
index 7241e6f..fe35359 100644
--- a/core/Lucy/Index/SortCache/NumericSortCache.c
+++ b/core/Lucy/Index/SortCache/NumericSortCache.c
@@ -70,11 +70,11 @@ NumSortCache_Destroy_IMP(NumericSortCache *self) {
NumericSortCacheIVARS *const ivars = NumSortCache_IVARS(self);
if (ivars->ord_in) {
InStream_Close(ivars->ord_in);
- InStream_Dec_RefCount(ivars->ord_in);
+ DECREF(ivars->ord_in);
}
if (ivars->dat_in) {
InStream_Close(ivars->dat_in);
- InStream_Dec_RefCount(ivars->dat_in);
+ DECREF(ivars->dat_in);
}
SUPER_DESTROY(self, NUMERICSORTCACHE);
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/6f48dc35/core/Lucy/Index/SortCache/TextSortCache.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SortCache/TextSortCache.c b/core/Lucy/Index/SortCache/TextSortCache.c
index ad533a4..b96c49f 100644
--- a/core/Lucy/Index/SortCache/TextSortCache.c
+++ b/core/Lucy/Index/SortCache/TextSortCache.c
@@ -73,15 +73,15 @@ TextSortCache_Destroy_IMP(TextSortCache *self) {
TextSortCacheIVARS *const ivars = TextSortCache_IVARS(self);
if (ivars->ord_in) {
InStream_Close(ivars->ord_in);
- InStream_Dec_RefCount(ivars->ord_in);
+ DECREF(ivars->ord_in);
}
if (ivars->ix_in) {
InStream_Close(ivars->ix_in);
- InStream_Dec_RefCount(ivars->ix_in);
+ DECREF(ivars->ix_in);
}
if (ivars->dat_in) {
InStream_Close(ivars->dat_in);
- InStream_Dec_RefCount(ivars->dat_in);
+ DECREF(ivars->dat_in);
}
SUPER_DESTROY(self, TEXTSORTCACHE);
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/6f48dc35/core/Lucy/Index/SortReader.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SortReader.c b/core/Lucy/Index/SortReader.c
index 2958422..28b55f0 100644
--- a/core/Lucy/Index/SortReader.c
+++ b/core/Lucy/Index/SortReader.c
@@ -118,19 +118,19 @@ void
DefSortReader_Close_IMP(DefaultSortReader *self) {
DefaultSortReaderIVARS *const ivars = DefSortReader_IVARS(self);
if (ivars->caches) {
- Hash_Dec_RefCount(ivars->caches);
+ DECREF(ivars->caches);
ivars->caches = NULL;
}
if (ivars->counts) {
- Hash_Dec_RefCount(ivars->counts);
+ DECREF(ivars->counts);
ivars->counts = NULL;
}
if (ivars->null_ords) {
- Hash_Dec_RefCount(ivars->null_ords);
+ DECREF(ivars->null_ords);
ivars->null_ords = NULL;
}
if (ivars->ord_widths) {
- Hash_Dec_RefCount(ivars->ord_widths);
+ DECREF(ivars->ord_widths);
ivars->ord_widths = NULL;
}
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/6f48dc35/core/Lucy/Search/PolyQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/PolyQuery.c b/core/Lucy/Search/PolyQuery.c
index 8e85af9..6d74c35 100644
--- a/core/Lucy/Search/PolyQuery.c
+++ b/core/Lucy/Search/PolyQuery.c
@@ -194,7 +194,7 @@ PolyCompiler_Highlight_Spans_IMP(PolyCompiler *self, Searcher *searcher,
doc_vec, field);
if (child_spans) {
VA_Push_VArray(spans, child_spans);
- VA_Dec_RefCount(child_spans);
+ DECREF(child_spans);
}
}
return spans;
http://git-wip-us.apache.org/repos/asf/lucy/blob/6f48dc35/core/Lucy/Store/CompoundFileReader.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/CompoundFileReader.c b/core/Lucy/Store/CompoundFileReader.c
index 8ee59c7..86307c3 100644
--- a/core/Lucy/Store/CompoundFileReader.c
+++ b/core/Lucy/Store/CompoundFileReader.c
@@ -299,11 +299,11 @@ bool
CFReaderDH_Close_IMP(CFReaderDirHandle *self) {
CFReaderDirHandleIVARS *const ivars = CFReaderDH_IVARS(self);
if (ivars->elems) {
- VA_Dec_RefCount(ivars->elems);
+ DECREF(ivars->elems);
ivars->elems = NULL;
}
if (ivars->cf_reader) {
- CFReader_Dec_RefCount(ivars->cf_reader);
+ DECREF(ivars->cf_reader);
ivars->cf_reader = NULL;
}
return true;
http://git-wip-us.apache.org/repos/asf/lucy/blob/6f48dc35/core/Lucy/Store/RAMDirHandle.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/RAMDirHandle.c b/core/Lucy/Store/RAMDirHandle.c
index 993f741..39caf05 100644
--- a/core/Lucy/Store/RAMDirHandle.c
+++ b/core/Lucy/Store/RAMDirHandle.c
@@ -42,11 +42,11 @@ bool
RAMDH_Close_IMP(RAMDirHandle *self) {
RAMDirHandleIVARS *const ivars = RAMDH_IVARS(self);
if (ivars->elems) {
- VA_Dec_RefCount(ivars->elems);
+ DECREF(ivars->elems);
ivars->elems = NULL;
}
if (ivars->folder) {
- RAMFolder_Dec_RefCount(ivars->folder);
+ DECREF(ivars->folder);
ivars->folder = NULL;
}
return true;