[PATCH 1/2] test: fix whitespace/indentation in symbol-test

[PATCH 1/2] test: fix whitespace/indentation in symbol-test

[Jani Nikula]

Not of much consequence, but makes it nicer to do further edits.
---
 test/symbol-test.cc | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/test/symbol-test.cc b/test/symbol-test.cc
index fb77b418a1a8..77dbc1af44b2 100644
--- a/test/symbol-test.cc
+++ b/test/symbol-test.cc
@@ -3,23 +3,25 @@
 #include <xapian.h>
 #include <notmuch.h>
 
+int main (int argc, char** argv)
+{
+    notmuch_database_t *notmuch;
+    char *message = NULL;
 
-int main(int argc, char** argv) {
-  notmuch_database_t *notmuch;
-  char *message = NULL;
+    if (notmuch_database_open_verbose (argv[1], NOTMUCH_DATABASE_MODE_READ_ONLY,
+				       &notmuch, &message)) {
+	if (message) {
+	    fputs (message, stderr);
+	    free (message);
+	}
+    }
 
-  if (notmuch_database_open_verbose  (argv[1], NOTMUCH_DATABASE_MODE_READ_ONLY, &notmuch, &message))
-      if (message) {
-	  fputs (message, stderr);
-	  free (message);
-      }
+    try {
+	(void) new Xapian::WritableDatabase (argv[2], Xapian::DB_OPEN);
+    } catch (const Xapian::Error &error) {
+	printf("caught %s\n", error.get_msg().c_str());
+	return 0;
+    }
 
-  try {
-    (void) new Xapian::WritableDatabase(argv[2], Xapian::DB_OPEN);
-  } catch (const Xapian::Error &error) {
-    printf("caught %s\n", error.get_msg().c_str());
-    return 0;
-  }
-
-  return 1;
+    return 1;
 }
-- 
2.1.4

[PATCH 2/2] test: check argc in symbol-test

[Jani Nikula]

Check argc mainly to fix unused parameter warning:

test/symbol-test.cc:7:14: warning: unused parameter ‘argc’ [-Wunused-parameter]
  int main(int argc, char** argv) {
               ^

This makes more sense than telling the compiler it's unused on
purpose.
---
 test/symbol-test.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/symbol-test.cc b/test/symbol-test.cc
index 77dbc1af44b2..23583bfc11b5 100644
--- a/test/symbol-test.cc
+++ b/test/symbol-test.cc
@@ -8,6 +8,9 @@ int main (int argc, char** argv)
     notmuch_database_t *notmuch;
     char *message = NULL;
 
+    if (argc != 2)
+	return 1;
+
     if (notmuch_database_open_verbose (argv[1], NOTMUCH_DATABASE_MODE_READ_ONLY,
 				       &notmuch, &message)) {
 	if (message) {
-- 
2.1.4

Re: [PATCH 1/2] test: fix whitespace/indentation in symbol-test

[Tomi Ollila]

On Fri, Sep 04 2015, Jani Nikula <jani@nikula.org> wrote:

> Not of much consequence, but makes it nicer to do further edits.
> ---

These 2 patches LGTM ! +1! :D

>  test/symbol-test.cc | 34 ++++++++++++++++++----------------
>  1 file changed, 18 insertions(+), 16 deletions(-)
>
> diff --git a/test/symbol-test.cc b/test/symbol-test.cc
> index fb77b418a1a8..77dbc1af44b2 100644
> --- a/test/symbol-test.cc
> +++ b/test/symbol-test.cc
> @@ -3,23 +3,25 @@
>  #include <xapian.h>
>  #include <notmuch.h>
>  
> +int main (int argc, char** argv)
> +{
> +    notmuch_database_t *notmuch;
> +    char *message = NULL;
>  
> -int main(int argc, char** argv) {
> -  notmuch_database_t *notmuch;
> -  char *message = NULL;
> +    if (notmuch_database_open_verbose (argv[1], NOTMUCH_DATABASE_MODE_READ_ONLY,
> +				       &notmuch, &message)) {
> +	if (message) {
> +	    fputs (message, stderr);
> +	    free (message);
> +	}
> +    }
>  
> -  if (notmuch_database_open_verbose  (argv[1], NOTMUCH_DATABASE_MODE_READ_ONLY, &notmuch, &message))
> -      if (message) {
> -	  fputs (message, stderr);
> -	  free (message);
> -      }
> +    try {
> +	(void) new Xapian::WritableDatabase (argv[2], Xapian::DB_OPEN);
> +    } catch (const Xapian::Error &error) {
> +	printf("caught %s\n", error.get_msg().c_str());
> +	return 0;
> +    }
>  
> -  try {
> -    (void) new Xapian::WritableDatabase(argv[2], Xapian::DB_OPEN);
> -  } catch (const Xapian::Error &error) {
> -    printf("caught %s\n", error.get_msg().c_str());
> -    return 0;
> -  }
> -
> -  return 1;
> +    return 1;
>  }
> -- 
> 2.1.4
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch

Re: [PATCH 2/2] test: check argc in symbol-test

[David Bremner]

Jani Nikula <jani@nikula.org> writes:

>  
> +    if (argc != 2)
> +	return 1;
> +

Off by one error? this seems to break T360

d

Re: [PATCH 1/2] test: fix whitespace/indentation in symbol-test

[David Bremner]

Jani Nikula <jani@nikula.org> writes:

> Not of much consequence, but makes it nicer to do further edits.

pushed to master

d

[PATCH v2] test: check argc in symbol-test

[Jani Nikula]

Check argc mainly to fix unused parameter warning:

test/symbol-test.cc:7:14: warning: unused parameter ‘argc’ [-Wunused-parameter]
  int main(int argc, char** argv) {
               ^

This makes more sense than telling the compiler it's unused on
purpose.
---
 test/symbol-test.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/symbol-test.cc b/test/symbol-test.cc
index 77dbc1af44b2..7454838bfd31 100644
--- a/test/symbol-test.cc
+++ b/test/symbol-test.cc
@@ -8,6 +8,9 @@ int main (int argc, char** argv)
     notmuch_database_t *notmuch;
     char *message = NULL;
 
+    if (argc != 3)
+	return 1;
+
     if (notmuch_database_open_verbose (argv[1], NOTMUCH_DATABASE_MODE_READ_ONLY,
 				       &notmuch, &message)) {
 	if (message) {
-- 
2.1.4

Re: [PATCH v2] test: check argc in symbol-test

[David Bremner]

Jani Nikula <jani@nikula.org> writes:

> Check argc mainly to fix unused parameter warning:
>

not obviously broken this time, shipped ;).

d