Re: [libvirt] [PATCH] storage_backend.c: assure clang that inputvol can't be NULL

Daniel P. Berrange wrote: When I recompiled everything, this patch needed adjustment. For example, I had to include internal.h for the definition of ATTRIBUTE_NONNULL. From: Jim Meyering <meyering(a)redhat.com&gt; Date: Thu, 3 Sep 2009 10:22:57 +0200 Subject: [PATCH 1/4] storage_backend.c: assure clang that inputvol can't be NULL * src/storage_backend.c: Include "internal.h". (virStorageBackendCopyToFD): Mark inputvol parameter as "nonnull". Remove test for non-NULL inputvol. Both callers ensure it's non-NULL. --- src/storage_backend.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/storage_backend.c b/src/storage_backend.c index c818142..77243ef 100644 --- a/src/storage_backend.c +++ b/src/storage_backend.c @@ -1,7 +1,7 @@ /* * storage_backend.c: internal storage driver backend contract * - * Copyright (C) 2007-2008 Red Hat, Inc. + * Copyright (C) 2007-2009 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -47,6 +47,7 @@ #include "util.h" #include "memory.h" #include "node_device.h" +#include "internal.h" #include "storage_backend.h" @@ -103,7 +104,7 @@ enum { TOOL_QCOW_CREATE, }; -static int +static int ATTRIBUTE_NONNULL (3) virStorageBackendCopyToFD(virConnectPtr conn, virStorageVolDefPtr vol, virStorageVolDefPtr inputvol, @@ -119,13 +120,11 @@ virStorageBackendCopyToFD(virConnectPtr conn, char zerobuf[512]; char *buf = NULL; - if (inputvol) { - if ((inputfd = open(inputvol->target.path, O_RDONLY)) < 0) { - virReportSystemError(conn, errno, - _("could not open input path '%s'"), - inputvol->target.path); - goto cleanup; - } + if ((inputfd = open(inputvol->target.path, O_RDONLY)) < 0) { + virReportSystemError(conn, errno, + _("could not open input path '%s'"), + inputvol->target.path); + goto cleanup; } bzero(&zerobuf, sizeof(zerobuf)); -- 1.6.4.2.395.ge3d52