From patchwork Mon Oct 22 16:06:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 1626741 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 13FE0DFB79 for ; Mon, 22 Oct 2012 16:06:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755527Ab2JVQG1 (ORCPT ); Mon, 22 Oct 2012 12:06:27 -0400 Received: from mail-ie0-f174.google.com ([209.85.223.174]:60605 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755440Ab2JVQG0 (ORCPT ); Mon, 22 Oct 2012 12:06:26 -0400 Received: by mail-ie0-f174.google.com with SMTP id k13so3828544iea.19 for ; Mon, 22 Oct 2012 09:06:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:subject:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=HpHEyU0rnpWzxqySE+14RRP1+P7NEGTPXDADLw6KSGg=; b=SQRixJ/V5JxYKQrTk4+rMI+Fe77K4MHdxESteHJJdGE974rNIigYq9N9H8MSWRPlp9 OfFU/Et9o1OmsyHRB0e5gZwzVtcYu0oFBQO20X2Ph8O1xndsuhf8CKgRzsVteph8eIka ME+IrRcYEhx9B+zxo5jABoCacaSBuY4AJ/h6I4j9mfnTng59OfIAaRmhUX7V4qBOQtlQ TPsimiwoSVsBToqUuCZjaXMN9k2InVF0C23ZtvpPp09cWQt6kaiXvA9sBWw37GJWhAKR nttOQijiOv4VhA95g5zStENbKsFwvsIluAZgCkb0wRs/DUz/TiEb8TEZmhx22ewGQ45U uGiw== Received: by 10.50.184.232 with SMTP id ex8mr16608887igc.30.1350921986610; Mon, 22 Oct 2012 09:06:26 -0700 (PDT) Received: from lebasque.1015granger.net (adsl-99-26-161-222.dsl.sfldmi.sbcglobal.net. [99.26.161.222]) by mx.google.com with ESMTPS id xn10sm22008382igb.4.2012.10.22.09.06.24 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 22 Oct 2012 09:06:26 -0700 (PDT) From: Chuck Lever Subject: [PATCH 05/10] mountd: Avoid unnecessary type conversions To: steved@redhat.com Cc: linux-nfs@vger.kernel.org Date: Mon, 22 Oct 2012 12:06:23 -0400 Message-ID: <20121022160623.4552.56505.stgit@lebasque.1015granger.net> In-Reply-To: <20121022160140.4552.34477.stgit@lebasque.1015granger.net> References: <20121022160140.4552.34477.stgit@lebasque.1015granger.net> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Clean up compiler warnings: cache.c: In function ‘get_uuid’: cache.c:249:2: warning: conversion to ‘size_t’ from ‘int’ may change the sign of the result [-Wsign-conversion] And the like. Seen with gcc version 4.6.3 20120306 (Red Hat 4.6.3-2) (GCC) Signed-off-by: Chuck Lever --- utils/mountd/cache.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c index 57a3fed..64ca5ba 100644 --- a/utils/mountd/cache.c +++ b/utils/mountd/cache.c @@ -238,13 +238,13 @@ static const char *get_uuid_blkdev(char *path) #define get_uuid_blkdev(path) (NULL) #endif -static int get_uuid(const char *val, int uuidlen, char *u) +static int get_uuid(const char *val, size_t uuidlen, char *u) { /* extract hex digits from uuidstr and compose a uuid * of the given length (max 16), xoring bytes to make * a smaller uuid. */ - int i = 0; + size_t i = 0; memset(u, 0, uuidlen); for ( ; *val ; val++) { @@ -268,7 +268,7 @@ static int get_uuid(const char *val, int uuidlen, char *u) return 1; } -static int uuid_by_path(char *path, int type, int uuidlen, char *uuid) +static int uuid_by_path(char *path, int type, size_t uuidlen, char *uuid) { /* get a uuid for the filesystem found at 'path'. * There are several possible ways of generating the @@ -366,7 +366,7 @@ struct parsed_fsid { unsigned int minor; unsigned int major; unsigned int fsidnum; - int uuidlen; + size_t uuidlen; char *fhuuid; };