From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id E04246DE01CE for ; Sat, 28 Jan 2017 04:21:36 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: 0.105 X-Spam-Level: X-Spam-Status: No, score=0.105 tagged_above=-999 required=5 tests=[AWL=0.125, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3fXIDIDJvnOR for ; Sat, 28 Jan 2017 04:21:34 -0800 (PST) Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by arlo.cworth.org (Postfix) with ESMTPS id 7A1026DE00AC for ; Sat, 28 Jan 2017 04:21:34 -0800 (PST) Received: by mail-lf0-f67.google.com with SMTP id v186so27870194lfa.2 for ; Sat, 28 Jan 2017 04:21:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nikula-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=ipWhwYCZxT1mv9ojCQPgbWnv8aE8m3BT9H4XH7daO+s=; b=THeOAV3ljiPPfcamce0YnEuaziimrBIF9IIovc/ZROLCsIdyDeHazpKEbbVvFkRcG/ IZiFWnvsoqA0aOB1R/653zKV5z1+KICsprs2lOgc5UdfJaFhKRZeuXuxhfWY5Z3+LF4p hAGsOyTJXKz9/aBlQVqwtwj8LQVfjV3MKrQOgQ4ebZ3SGvb2wRizpvxti34M1udVF/mS r9x5RFfsduj3z8SBrEXnscX3tPsKLMInANYNG8Hdafxq09fHq86eDYyB9R7aAawoa8AL KmdmxG7GivL2/xEInXI8snmvED6VjixsCCfRYZFN4RWxiNuGWUO70bAe7I9RQb93Hx7q VMAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ipWhwYCZxT1mv9ojCQPgbWnv8aE8m3BT9H4XH7daO+s=; b=XUjgoKi6fq63dIYSZs4UULnjZ80Q8a5olI+hxQqB6kqj5wIbGLo78fOgUomU9Ld4aX DXrdrOiV3NeXIbcRNAA8k5sYnm00D2Up/Wa0cnu/t6+KBZWluLCUecWcdGMNyAM3d7Qv GoiY+7Gx0Z/mHii/2b1lYy89jElQTeFYhQvoOXoOHPXtGFNzeW1WfAVngt3OcYEOqNtV y8E54EW5o0h+996D3P+Blo49+eCXgcL2jqIxXN7whImFwkEaS7K0ZS00ubbFwpHDs1Au OpUsTx5wQiPSpFqmZ6d3hHlHInhdpp3kQob4Z6H5YPOJEknKxVh7kfvAz9z4+hEsW7zm AOpA== X-Gm-Message-State: AIkVDXLUP6+BcjiEl0BWxcF+jgpFSD6R6G4wcMLC1PrYvEQvTUvw5tWiTFw8GJX6yZjsNA== X-Received: by 10.46.22.87 with SMTP id 23mr4515780ljw.50.1485606092288; Sat, 28 Jan 2017 04:21:32 -0800 (PST) Received: from localhost (mobile-access-5d6a3e-39.dhcp.inet.fi. [93.106.62.39]) by smtp.gmail.com with ESMTPSA id 33sm2037882lfs.43.2017.01.28.04.21.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 28 Jan 2017 04:21:31 -0800 (PST) From: Jani Nikula To: notmuch@notmuchmail.org Subject: [PATCH 1/2] cli/show: abstract get content disposition Date: Sat, 28 Jan 2017 14:21:29 +0200 Message-Id: <20170128122130.2935-1-jani@nikula.org> X-Mailer: git-send-email 2.11.0 X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jan 2017 12:21:37 -0000 Reduce duplication in follow-up work. As a side effect, handle error returns from g_mime_content_disposition_get_disposition() without segfaulting. --- notmuch-show.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/notmuch-show.c b/notmuch-show.c index 22fa655ad20d..8b38fe6db136 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -110,6 +110,17 @@ _get_one_line_summary (const void *ctx, notmuch_message_t *message) from, relative_date, tags); } +static const char *_get_disposition(GMimeObject *meta) +{ + GMimeContentDisposition *disposition; + + disposition = g_mime_object_get_content_disposition (meta); + if (!disposition) + return NULL; + + return g_mime_content_disposition_get_disposition (disposition); +} + /* Emit a sequence of key/value pairs for the metadata of message. * The caller should begin a map before calling this. */ static void @@ -450,14 +461,13 @@ format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node, notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED) ? 1 : 0, notmuch_message_get_filename (message)); } else { - GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (meta); + const char *disposition = _get_disposition (meta); const char *cid = g_mime_object_get_content_id (meta); const char *filename = leaf ? g_mime_part_get_filename (GMIME_PART (node->part)) : NULL; if (disposition && - strcasecmp (g_mime_content_disposition_get_disposition (disposition), - GMIME_DISPOSITION_ATTACHMENT) == 0) + strcasecmp (disposition, GMIME_DISPOSITION_ATTACHMENT) == 0) part_type = "attachment"; else part_type = "part"; -- 2.11.0