lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nwelln...@apache.org
Subject [lucy-commits] [13/20] git commit: refs/heads/cfish-string-prep1 - Convert Store::Lock to StringIterator
Date Sat, 07 Sep 2013 16:53:34 GMT
Convert Store::Lock to StringIterator


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

Branch: refs/heads/cfish-string-prep1
Commit: 07945bd60f1928bea75f275b0637e3ccf470cf74
Parents: a3d2e27
Author: Nick Wellnhofer <wellnhofer@aevum.de>
Authored: Sat Sep 7 16:17:00 2013 +0200
Committer: Nick Wellnhofer <wellnhofer@aevum.de>
Committed: Sat Sep 7 18:14:05 2013 +0200

----------------------------------------------------------------------
 core/Lucy/Store/Lock.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/07945bd6/core/Lucy/Store/Lock.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/Lock.c b/core/Lucy/Store/Lock.c
index 18e965a..4d778d0 100644
--- a/core/Lucy/Store/Lock.c
+++ b/core/Lucy/Store/Lock.c
@@ -39,9 +39,9 @@ Lock_init(Lock *self, Folder *folder, const String *name,
         DECREF(self);
         THROW(ERR, "Invalid value for 'interval': %i32", interval);
     }
-    StackString *scratch = SSTR_WRAP(name);
+    StringIterator *iter = Str_Top(name);
     uint32_t code_point;
-    while (0 != (code_point = SStr_Nibble(scratch))) {
+    while (STRITER_DONE != (code_point = StrIter_Next(iter))) {
         if (isalnum(code_point)
             || code_point == '.'
             || code_point == '-'
@@ -52,6 +52,7 @@ Lock_init(Lock *self, Folder *folder, const String *name,
         DECREF(self);
         THROW(ERR, "Lock name contains disallowed characters: '%o'", name);
     }
+    DECREF(iter);
 
     // Assign.
     ivars->folder       = (Folder*)INCREF(folder);
@@ -230,17 +231,18 @@ LFLock_Maybe_Delete_File_IMP(LockFileLock *self, const String *path,
     LockFileLockIVARS *const ivars = LFLock_IVARS(self);
     Folder *folder  = ivars->folder;
     bool    success = false;
-    StackString *scratch = SSTR_WRAP(path);
 
     // Only delete locks that start with our lock name.
-    String *lock_dir_name = (String*)SSTR_WRAP_STR("locks", 5);
-    if (!SStr_Starts_With(scratch, lock_dir_name)) {
+    if (!Str_Starts_With_Str(path, "locks", 5)) {
         return false;
     }
-    SStr_Nip(scratch, Str_Get_Size(lock_dir_name) + 1);
-    if (!SStr_Starts_With(scratch, ivars->name)) {
+    StringIterator *iter = Str_Top(path);
+    StrIter_Advance(iter, 5 + 1);
+    if (!StrIter_Starts_With(iter, ivars->name)) {
+        DECREF(iter);
         return false;
     }
+    DECREF(iter);
 
     // Attempt to delete dead lock file.
     if (Folder_Exists(folder, path)) {


Mime
View raw message