External/libvirt
1
0
Fork 0
Code

storage_backend.c: assure clang that inputvol can't be NULL

Browse Source 
* 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.
This commit is contained in:
Jim Meyering 2009-09-03 10:22:57 +02:00
parent d9b4538469
commit 5cb74dadaf
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/storage_backend.c
View File

@ -1,7 +1,7 @@
/* /*
* storage_backend.c: internal storage driver backend contract * 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 * Copyright (C) 2007-2008 Daniel P. Berrange
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -47,6 +47,7 @@
#include "util.h" #include "util.h"
#include "memory.h" #include "memory.h"
#include "node_device.h" #include "node_device.h"
#include "internal.h"
#include "storage_backend.h" #include "storage_backend.h"
@ -103,7 +104,7 @@ enum {
TOOL_QCOW_CREATE, TOOL_QCOW_CREATE,
}; };
static int static int ATTRIBUTE_NONNULL (3)
virStorageBackendCopyToFD(virConnectPtr conn, virStorageBackendCopyToFD(virConnectPtr conn,
virStorageVolDefPtr vol, virStorageVolDefPtr vol,
virStorageVolDefPtr inputvol, virStorageVolDefPtr inputvol,
@ -119,13 +120,11 @@ virStorageBackendCopyToFD(virConnectPtr conn,
char zerobuf[512]; char zerobuf[512];
char *buf = NULL; char *buf = NULL;
if (inputvol) { if ((inputfd = open(inputvol->target.path, O_RDONLY)) < 0) {
if ((inputfd = open(inputvol->target.path, O_RDONLY)) < 0) { virReportSystemError(conn, errno,
virReportSystemError(conn, errno, _("could not open input path '%s'"),
_("could not open input path '%s'"), inputvol->target.path);
inputvol->target.path); goto cleanup;
goto cleanup;
}
} }
bzero(&zerobuf, sizeof(zerobuf)); bzero(&zerobuf, sizeof(zerobuf));