提交 5cb74dad 编写于 作者: J Jim Meyering

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.
上级 d9b45384
/*
* 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));
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册