On Wed, Feb 10, 2010 at 01:36:22PM +0000, Daniel P. Berrange wrote: > The virConnectPtr is no longer required for error reporting since > that is recorded in a thread local. Remove use of virConnectPtr > from all APIs in storage_conf.{h,c} and storage_encryption_conf.{h,c} > and update all callers to match > --- > src/conf/domain_conf.c | 4 +- > src/conf/storage_conf.c | 257 ++++++++++++++------------------- > src/conf/storage_conf.h | 51 +++----- > src/conf/storage_encryption_conf.c | 45 +++--- > src/conf/storage_encryption_conf.h | 7 +- > src/storage/storage_backend.c | 77 +++++----- > src/storage/storage_backend.h | 18 +-- > src/storage/storage_backend_disk.c | 74 +++++------ > src/storage/storage_backend_fs.c | 59 ++++---- > src/storage/storage_backend_iscsi.c | 109 ++++++-------- > src/storage/storage_backend_logical.c | 49 +++---- > src/storage/storage_backend_mpath.c | 30 ++--- > src/storage/storage_backend_scsi.c | 47 +++---- > src/storage/storage_backend_scsi.h | 3 +- > src/storage/storage_driver.c | 164 +++++++++++----------- > src/test/test_driver.c | 37 +++--- > src/vbox/vbox_tmpl.c | 4 +- > tests/storagepoolxml2xmltest.c | 4 +- > tests/storagevolxml2xmltest.c | 6 +- > 19 files changed, 465 insertions(+), 580 deletions(-) [...] > if (!virFileMatchesNameSuffix(file, def->name, ".xml")) { > - virStorageError(conn, VIR_ERR_INVALID_STORAGE_POOL, > - "Storage pool config filename '%s' does not match pool name '%s'", > - path, def->name); > + virStorageReportError(VIR_ERR_INVALID_STORAGE_POOL, > + "Storage pool config filename '%s' does not match pool name '%s'", > + path, def->name); stylistic, I prefer to not align on the opening brace than go over 80 columns Pfeewww that was huge ... done ! ACK, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@xxxxxxxxxxxx | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/ -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list