[PATCH] cli: cast timeval fields to long for format

diff --git a/b9/e7bd42b74c3df886294c624509bbfcd62e6549 b/b9/e7bd42b74c3df886294c624509bbfcd62e6549
new file mode 100644 (file)
index 0000000..7368534
--- /dev/null
+++ b/b9/e7bd42b74c3df886294c624509bbfcd62e6549
@@ -0,0 +1,83 @@
+Return-Path: <jani@nikula.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 322C5431FB6\r
+       for <notmuch@notmuchmail.org>; Tue, 28 Oct 2014 01:17:11 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id kigK+XqnaCKH for <notmuch@notmuchmail.org>;\r
+       Tue, 28 Oct 2014 01:17:07 -0700 (PDT)\r
+Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com\r
+       [209.85.212.176]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 75AE4431FAE\r
+       for <notmuch@notmuchmail.org>; Tue, 28 Oct 2014 01:17:07 -0700 (PDT)\r
+Received: by mail-wi0-f176.google.com with SMTP id n3so8476363wiv.9\r
+       for <notmuch@notmuchmail.org>; Tue, 28 Oct 2014 01:17:06 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=1e100.net; s=20130820;\r
+       h=x-gm-message-state:from:to:cc:subject:date:message-id;\r
+       bh=eRzFfNCQalOmt9JmCRep8yJFyAJ22e+Czep+17yghic=;\r
+       b=ECbS63l3FanLC1etnXKPFoDwqpiTmTgokXFlKd9NkYX4L5fIrz2epeW0uwjFX4TTj2\r
+       wMhF/pHDdAcKKqfbxItUmwe81KfRcQQtq0CrshdmbmN8dNK6fjZqjczn1RYmoVSqDiJK\r
+       EJXdkKPoCawJX9VPS2rS8ZkcjnJq9Wah91cGLa+Q2OYLX8wB4LbffKvFTlIC52sgvXwa\r
+       hTgrXe/BXsNDToHJbHbLXtdHTsjpsVfW0jLtfLa88x0GZ3Qtx6YWAadF4yH7ZX/yTFdB\r
+       lVYhVP3tUNxI48EFPEokO/pH51tpCAK1r9FWxTR/eZZDx2Mn0qIOzNHvpXaQn7gJLpqO\r
+       x8kQ==\r
+X-Gm-Message-State:\r
+ ALoCoQmrtdvL6XmVLBJh8X57FsWO9RTNzlQ1xu+FJG9xGkm9rtWhT+TmhQNytpksqsc3bZACTBDd\r
+X-Received: by 10.180.76.41 with SMTP id h9mr2787026wiw.40.1414484226225;\r
+       Tue, 28 Oct 2014 01:17:06 -0700 (PDT)\r
+Received: from localhost ([2001:4b98:dc0:43:216:3eff:fe1b:25f3])\r
+       by mx.google.com with ESMTPSA id wr9sm896934wjb.42.2014.10.28.01.17.05\r
+       for <multiple recipients>\r
+       (version=TLSv1.1 cipher=RC4-SHA bits=128/128);\r
+       Tue, 28 Oct 2014 01:17:05 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] cli: cast timeval fields to long for format\r
+Date: Tue, 28 Oct 2014 09:17:26 +0100\r
+Message-Id: <1414484246-19659-1-git-send-email-jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.2.5\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 28 Oct 2014 08:17:11 -0000\r
+\r
+This hides platform differences between struct timeval field types.\r
+---\r
+ notmuch-insert.c |    2 +-\r
+ 1 files changed, 1 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/notmuch-insert.c b/notmuch-insert.c\r
+index 7074077..0d2d810 100644\r
+--- a/notmuch-insert.c\r
++++ b/notmuch-insert.c\r
+@@ -197,7 +197,7 @@ tempfilename (const void *ctx)\r
+     gettimeofday (&tv, NULL);\r
+ \r
+     filename = talloc_asprintf (ctx, "%ld.M%ldP%d.%s",\r
+-                              tv.tv_sec, tv.tv_usec, pid, hostname);\r
++                              (long) tv.tv_sec, (long) tv.tv_usec, pid, hostname);\r
+     if (! filename)\r
+       fprintf (stderr, "Error: %s\n", strerror (ENOMEM));\r
+ \r
+-- \r
+1.7.2.5\r
+\r