From patchwork Thu Oct 25 10:27:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 194107 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id A96532C009A for ; Thu, 25 Oct 2012 21:27:46 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TRKfB-0000LR-4y; Thu, 25 Oct 2012 10:27:45 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TRKf9-0000LI-Az for fwts-devel@lists.ubuntu.com; Thu, 25 Oct 2012 10:27:43 +0000 Received: from cpc3-craw6-2-0-cust180.croy.cable.virginmedia.com ([77.100.248.181] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1TRKf9-0002Ca-6F for fwts-devel@lists.ubuntu.com; Thu, 25 Oct 2012 10:27:43 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH] fwts_mmap: fwts_page_size fix comparing size_t against -1 Date: Thu, 25 Oct 2012 11:27:42 +0100 Message-Id: <1351160862-29463-1-git-send-email-colin.king@canonical.com> X-Mailer: git-send-email 1.7.10.4 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: fwts-devel-bounces@lists.ubuntu.com Errors-To: fwts-devel-bounces@lists.ubuntu.com From: Colin Ian King sysconf returns a long and we need to compare this to -1 rather than a size_t (which is always positive). Signed-off-by: Colin Ian King Acked-by: Alex Hung Acked-by: Ivan Hu --- src/lib/src/fwts_mmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/src/fwts_mmap.c b/src/lib/src/fwts_mmap.c index c5acd26..58ab973 100644 --- a/src/lib/src/fwts_mmap.c +++ b/src/lib/src/fwts_mmap.c @@ -33,12 +33,12 @@ */ size_t fwts_page_size(void) { - size_t page_size; + long page_size; page_size = sysconf(_SC_PAGESIZE); /* If sysconf() returns -1, default it 4K */ - return page_size == -1 ? FWTS_DEFAULT_PAGE_SIZE : page_size; + return (size_t)(page_size == -1 ? FWTS_DEFAULT_PAGE_SIZE : page_size); } /*