From 23958aedf43500a8b9aac06e0fd720884d1343c1 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Fri, 7 May 2010 14:34:15 -0600 Subject: [PATCH] storage_encryption: silence clang warning For printf("%*s",foo,bar), clang complains if foo is not int: warning: field width should have type 'int', but argument has type 'unsigned int' [-Wformat] * src/conf/storage_encryption_conf.c (virStorageEncryptionSecretFormat, virStorageEncryptionFormat): Use correct type. * src/conf/storage_encryption_conf.h (virStorageEncryptionFormat): Likewise. --- src/conf/storage_encryption_conf.c | 9 +++++---- src/conf/storage_encryption_conf.h | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encryption_conf.c index 7a64050c90..7bbdbc1871 100644 --- a/src/conf/storage_encryption_conf.c +++ b/src/conf/storage_encryption_conf.c @@ -1,7 +1,7 @@ /* * storage_encryption_conf.c: volume encryption information * - * Copyright (C) 2009 Red Hat, Inc. + * Copyright (C) 2009-2010 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -216,7 +216,7 @@ virStorageEncryptionParseNode(xmlDocPtr xml, xmlNodePtr root) static int virStorageEncryptionSecretFormat(virBufferPtr buf, virStorageEncryptionSecretPtr secret, - unsigned int indent) + int indent) { const char *type; char uuidstr[VIR_UUID_STRING_BUFLEN]; @@ -237,7 +237,7 @@ virStorageEncryptionSecretFormat(virBufferPtr buf, int virStorageEncryptionFormat(virBufferPtr buf, virStorageEncryptionPtr enc, - unsigned int indent) + int indent) { const char *format; size_t i; @@ -252,7 +252,8 @@ virStorageEncryptionFormat(virBufferPtr buf, indent, "", format); for (i = 0; i < enc->nsecrets; i++) { - if (virStorageEncryptionSecretFormat(buf, enc->secrets[i], indent + 2) < 0) + if (virStorageEncryptionSecretFormat(buf, enc->secrets[i], + indent + 2) < 0) return -1; } diff --git a/src/conf/storage_encryption_conf.h b/src/conf/storage_encryption_conf.h index 83092554c1..c722cc698d 100644 --- a/src/conf/storage_encryption_conf.h +++ b/src/conf/storage_encryption_conf.h @@ -1,7 +1,7 @@ /* * storage_encryption_conf.h: volume encryption information * - * Copyright (C) 2009 Red Hat, Inc. + * Copyright (C) 2009-2010 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -68,7 +68,7 @@ virStorageEncryptionPtr virStorageEncryptionParseNode(xmlDocPtr xml, xmlNodePtr root); int virStorageEncryptionFormat(virBufferPtr buf, virStorageEncryptionPtr enc, - unsigned int indent); + int indent); /* A helper for VIR_STORAGE_ENCRYPTION_FORMAT_QCOW */ enum { -- 2.47.2