External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-12 15:52:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

maint: VIR_ERROR/VIR_ERROR0: mark up the remaining ones manually

Browse Source 
Handle concatenated strings manually.
This commit is contained in:
Jim Meyering 2010-05-20 08:28:53 +02:00
parent 2d3208029b
commit 82a3c81d8c
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/esx/esx_vi.c
View File

@ -2770,13 +2770,13 @@ esxVI_WaitForTaskCompletion(esxVI_Context *ctx,
if (taskInfo->cancelable == esxVI_Boolean_True) { if (taskInfo->cancelable == esxVI_Boolean_True) {
if (esxVI_CancelTask(ctx, task) < 0) { if (esxVI_CancelTask(ctx, task) < 0) {
VIR_ERROR0("Cancelable task is blocked by an " VIR_ERROR0(_("Cancelable task is blocked by an "
"unanswered question but cancelation " "unanswered question but cancelation "
"failed"); "failed"));
} }
} else { } else {
VIR_ERROR0("Non-cancelable task is blocked by an " VIR_ERROR0(_("Non-cancelable task is blocked by an "
"unanswered question"); "unanswered question"));
} }
/* FIXME: Enable error reporting here again */ /* FIXME: Enable error reporting here again */

20
src/node_device/node_device_udev.c
View File

@ -122,8 +122,8 @@ static int udevGetDeviceProperty(struct udev_device *udev_device,
* of the function must also be changed. */ * of the function must also be changed. */
*property_value = strdup(udev_value); *property_value = strdup(udev_value);
if (*property_value == NULL) { if (*property_value == NULL) {
VIR_ERROR("Failed to allocate memory for property value for " VIR_ERROR(_("Failed to allocate memory for property value for "
"property key '%s' on device with sysname '%s'", "property key '%s' on device with sysname '%s'"),
property_key, udev_device_get_sysname(udev_device)); property_key, udev_device_get_sysname(udev_device));
virReportOOMError(); virReportOOMError();
ret = PROPERTY_ERROR; ret = PROPERTY_ERROR;
@ -211,8 +211,8 @@ static int udevGetDeviceSysfsAttr(struct udev_device *udev_device,
* of the function must also be changed. */ * of the function must also be changed. */
*attr_value = strdup(udev_value); *attr_value = strdup(udev_value);
if (*attr_value == NULL) { if (*attr_value == NULL) {
VIR_ERROR("Failed to allocate memory for sysfs attribute value for " VIR_ERROR(_("Failed to allocate memory for sysfs attribute value for "
"sysfs attribute '%s' on device with sysname '%s'", "sysfs attribute '%s' on device with sysname '%s'"),
attr_name, udev_device_get_sysname(udev_device)); attr_name, udev_device_get_sysname(udev_device));
virReportOOMError(); virReportOOMError();
ret = PROPERTY_ERROR; ret = PROPERTY_ERROR;
@ -329,8 +329,8 @@ static int udevGenerateDeviceName(struct udev_device *device,
if (virBufferError(&buf)) { if (virBufferError(&buf)) {
virBufferFreeAndReset(&buf); virBufferFreeAndReset(&buf);
VIR_ERROR("Buffer error when generating device name for device " VIR_ERROR(_("Buffer error when generating device name for device "
"with sysname '%s'", udev_device_get_sysname(device)); "with sysname '%s'"), udev_device_get_sysname(device));
ret = -1; ret = -1;
} }
@ -639,8 +639,8 @@ static int udevProcessSCSIHost(struct udev_device *device ATTRIBUTE_UNUSED,
filename = basename(def->sysfs_path); filename = basename(def->sysfs_path);
if (!STRPREFIX(filename, "host")) { if (!STRPREFIX(filename, "host")) {
VIR_ERROR("SCSI host found, but its udev name '%s' does " VIR_ERROR(_("SCSI host found, but its udev name '%s' does "
"not begin with 'host'", filename); "not begin with 'host'"), filename);
goto out; goto out;
} }
@ -1401,8 +1401,8 @@ static void udevEventHandleCallback(int watch ATTRIBUTE_UNUSED,
udev_fd = udev_monitor_get_fd(udev_monitor); udev_fd = udev_monitor_get_fd(udev_monitor);
if (fd != udev_fd) { if (fd != udev_fd) {
VIR_ERROR("File descriptor returned by udev %d does not " VIR_ERROR(_("File descriptor returned by udev %d does not "
"match node device file descriptor %d", fd, udev_fd); "match node device file descriptor %d"), fd, udev_fd);
goto out; goto out;
} }