[notmuch] [PATCH] lib/database.cc: coding style

2009-11-22 Thread Carl Worth
On Sat, 21 Nov 2009 23:14:39 +, Chris Wilson  
wrote:
> Carl claims he must have been distracted when he wrote this...

Indeed. Thanks for keeping my sloppy code looking so clean.

-Carl


[notmuch] [PATCH] lib/database.cc: coding style

2009-11-21 Thread Chris Wilson
Carl claims he must have been distracted when he wrote this...

Signed-off-by: Chris Wilson 
---
 lib/database.cc |   18 +++---
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/database.cc b/lib/database.cc
index 207246c..0f95aa1 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -147,17 +147,20 @@ _find_prefix (const char *name)
 {
 unsigned int i;

-for (i = 0; i < ARRAY_SIZE (BOOLEAN_PREFIX_INTERNAL); i++)
+for (i = 0; i < ARRAY_SIZE (BOOLEAN_PREFIX_INTERNAL); i++) {
if (strcmp (name, BOOLEAN_PREFIX_INTERNAL[i].name) == 0)
return BOOLEAN_PREFIX_INTERNAL[i].prefix;
+}

-for (i = 0; i < ARRAY_SIZE (BOOLEAN_PREFIX_EXTERNAL); i++)
+for (i = 0; i < ARRAY_SIZE (BOOLEAN_PREFIX_EXTERNAL); i++) {
if (strcmp (name, BOOLEAN_PREFIX_EXTERNAL[i].name) == 0)
return BOOLEAN_PREFIX_EXTERNAL[i].prefix;
+}

-for (i = 0; i < ARRAY_SIZE (PROBABILISTIC_PREFIX); i++)
+for (i = 0; i < ARRAY_SIZE (PROBABILISTIC_PREFIX); i++) {
if (strcmp (name, PROBABILISTIC_PREFIX[i].name) == 0)
return PROBABILISTIC_PREFIX[i].prefix;
+}

 INTERNAL_ERROR ("No prefix exists for '%s'\n", name);

@@ -293,13 +296,14 @@ skip_space_and_comments (const char **str)
int nesting = 1;
s++;
while (*s && nesting) {
-   if (*s == '(')
+   if (*s == '(') {
nesting++;
-   else if (*s == ')')
+   } else if (*s == ')') {
nesting--;
-   else if (*s == '\\')
+   } else if (*s == '\\') {
if (*(s+1))
s++;
+   }
s++;
}
}
@@ -508,7 +512,7 @@ notmuch_database_open (const char *path)
 error.get_msg().c_str());
notmuch = NULL;
 }
-
+
   DONE:
 if (notmuch_path)
free (notmuch_path);
-- 
1.6.5.3