Use notmuch_database_destroy instead of notmuch_database_close

[notmuch] / notmuch-show.c

diff --git a/notmuch-show.c b/notmuch-show.c
index 69164bdae5346f404316776f9566b686298ca2d3..3b6667c4bdbd5d411fc35dabbe40bce8bc74d19b 100644 (file)
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -26,10 +26,7 @@ format_part_text (const void *ctx, mime_node_t *node,
                  int indent, const notmuch_show_params_t *params);
 
 static const notmuch_show_format_t format_text = {
                  int indent, const notmuch_show_params_t *params);
 
 static const notmuch_show_format_t format_text = {

-    .message_set_start = "",

     .part = format_part_text,
     .part = format_part_text,

-    .message_set_sep = "",
-    .message_set_end = ""

 };
 
 static notmuch_status_t
 };
 
 static notmuch_status_t


@@ -48,10 +45,7 @@ format_part_mbox (const void *ctx, mime_node_t *node,
                  int indent, const notmuch_show_params_t *params);
 
 static const notmuch_show_format_t format_mbox = {
                  int indent, const notmuch_show_params_t *params);
 
 static const notmuch_show_format_t format_mbox = {

-    .message_set_start = "",

     .part = format_part_mbox,
     .part = format_part_mbox,

-    .message_set_sep = "",
-    .message_set_end = ""

 };
 
 static notmuch_status_t
 };
 
 static notmuch_status_t


@@ -60,10 +54,7 @@ format_part_raw (unused (const void *ctx), mime_node_t *node,
                 unused (const notmuch_show_params_t *params));
 
 static const notmuch_show_format_t format_raw = {
                 unused (const notmuch_show_params_t *params));
 
 static const notmuch_show_format_t format_raw = {

-    .message_set_start = "",

     .part = format_part_raw,
     .part = format_part_raw,

-    .message_set_sep = "",
-    .message_set_end = ""

 };
 
 static const char *
 };
 
 static const char *


@@ -845,17 +836,19 @@ show_messages (void *ctx,
     int next_indent;
     notmuch_status_t status, res = NOTMUCH_STATUS_SUCCESS;
 
     int next_indent;
     notmuch_status_t status, res = NOTMUCH_STATUS_SUCCESS;
 

-    fputs (format->message_set_start, stdout);
+    if (format->message_set_start)
+       fputs (format->message_set_start, stdout);

 
     for (;
         notmuch_messages_valid (messages);
         notmuch_messages_move_to_next (messages))
     {
 
     for (;
         notmuch_messages_valid (messages);
         notmuch_messages_move_to_next (messages))
     {

-       if (!first_set)
+       if (!first_set && format->message_set_sep)

            fputs (format->message_set_sep, stdout);
        first_set = 0;
 
            fputs (format->message_set_sep, stdout);
        first_set = 0;
 

-       fputs (format->message_set_start, stdout);
+       if (format->message_set_start)
+           fputs (format->message_set_start, stdout);

 
        message = notmuch_messages_get (messages);
 
 
        message = notmuch_messages_get (messages);
 


@@ -870,7 +863,7 @@ show_messages (void *ctx,
                res = status;
            next_indent = indent + 1;
 
                res = status;
            next_indent = indent + 1;
 

-           if (!status)
+           if (!status && format->message_set_sep)

                fputs (format->message_set_sep, stdout);
        }
 
                fputs (format->message_set_sep, stdout);
        }
 


@@ -884,10 +877,12 @@ show_messages (void *ctx,
 
        notmuch_message_destroy (message);
 
 
        notmuch_message_destroy (message);
 

-       fputs (format->message_set_end, stdout);
+       if (format->message_set_end)
+           fputs (format->message_set_end, stdout);

     }
 
     }
 

-    fputs (format->message_set_end, stdout);
+    if (format->message_set_end)
+       fputs (format->message_set_end, stdout);

 
     return res;
 }
 
     return res;
 }


@@ -933,7 +928,8 @@ do_show (void *ctx,
     int first_toplevel = 1;
     notmuch_status_t status, res = NOTMUCH_STATUS_SUCCESS;
 
     int first_toplevel = 1;
     notmuch_status_t status, res = NOTMUCH_STATUS_SUCCESS;
 

-    fputs (format->message_set_start, stdout);
+    if (format->message_set_start)
+       fputs (format->message_set_start, stdout);

 
     for (threads = notmuch_query_search_threads (query);
         notmuch_threads_valid (threads);
 
     for (threads = notmuch_query_search_threads (query);
         notmuch_threads_valid (threads);


@@ -947,7 +943,7 @@ do_show (void *ctx,
            INTERNAL_ERROR ("Thread %s has no toplevel messages.\n",
                            notmuch_thread_get_thread_id (thread));
 
            INTERNAL_ERROR ("Thread %s has no toplevel messages.\n",
                            notmuch_thread_get_thread_id (thread));
 

-       if (!first_toplevel)
+       if (!first_toplevel && format->message_set_sep)

            fputs (format->message_set_sep, stdout);
        first_toplevel = 0;
 
            fputs (format->message_set_sep, stdout);
        first_toplevel = 0;
 


@@ -959,7 +955,8 @@ do_show (void *ctx,
 
     }
 
 
     }
 

-    fputs (format->message_set_end, stdout);
+    if (format->message_set_end)
+       fputs (format->message_set_end, stdout);

 
     return res != NOTMUCH_STATUS_SUCCESS;
 }
 
     return res != NOTMUCH_STATUS_SUCCESS;
 }


@@ -1120,7 +1117,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
     }
 
     notmuch_query_destroy (query);
     }
 
     notmuch_query_destroy (query);

-    notmuch_database_close (notmuch);
+    notmuch_database_destroy (notmuch);

 
     if (params.cryptoctx)
        g_object_unref(params.cryptoctx);
 
     if (params.cryptoctx)
        g_object_unref(params.cryptoctx);