提交 07be2403 编写于 作者: J Justin Clift 提交者: Eric Blake

virsh: change printf() calls to vshPrint()

Trivial fix changing printf() calls to vshPrint() where the ctl
variable is available.
上级 7d38d7b4
...@@ -1620,25 +1620,25 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd) ...@@ -1620,25 +1620,25 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd)
for (i = 0; i < nparams; i++){ for (i = 0; i < nparams; i++){
switch (params[i].type) { switch (params[i].type) {
case VIR_DOMAIN_SCHED_FIELD_INT: case VIR_DOMAIN_SCHED_FIELD_INT:
printf("%-15s: %d\n", params[i].field, params[i].value.i); vshPrint(ctl, "%-15s: %d\n", params[i].field, params[i].value.i);
break; break;
case VIR_DOMAIN_SCHED_FIELD_UINT: case VIR_DOMAIN_SCHED_FIELD_UINT:
printf("%-15s: %u\n", params[i].field, params[i].value.ui); vshPrint(ctl, "%-15s: %u\n", params[i].field, params[i].value.ui);
break; break;
case VIR_DOMAIN_SCHED_FIELD_LLONG: case VIR_DOMAIN_SCHED_FIELD_LLONG:
printf("%-15s: %lld\n", params[i].field, params[i].value.l); vshPrint(ctl, "%-15s: %lld\n", params[i].field, params[i].value.l);
break; break;
case VIR_DOMAIN_SCHED_FIELD_ULLONG: case VIR_DOMAIN_SCHED_FIELD_ULLONG:
printf("%-15s: %llu\n", params[i].field, params[i].value.ul); vshPrint(ctl, "%-15s: %llu\n", params[i].field, params[i].value.ul);
break; break;
case VIR_DOMAIN_SCHED_FIELD_DOUBLE: case VIR_DOMAIN_SCHED_FIELD_DOUBLE:
printf("%-15s: %f\n", params[i].field, params[i].value.d); vshPrint(ctl, "%-15s: %f\n", params[i].field, params[i].value.d);
break; break;
case VIR_DOMAIN_SCHED_FIELD_BOOLEAN: case VIR_DOMAIN_SCHED_FIELD_BOOLEAN:
printf("%-15s: %d\n", params[i].field, params[i].value.b); vshPrint(ctl, "%-15s: %d\n", params[i].field, params[i].value.b);
break; break;
default: default:
printf("not implemented scheduler parameter type\n"); vshPrint(ctl, "not implemented scheduler parameter type\n");
} }
} }
} }
...@@ -2654,7 +2654,7 @@ cmdDumpXML(vshControl *ctl, const vshCmd *cmd) ...@@ -2654,7 +2654,7 @@ cmdDumpXML(vshControl *ctl, const vshCmd *cmd)
dump = virDomainGetXMLDesc(dom, flags); dump = virDomainGetXMLDesc(dom, flags);
if (dump != NULL) { if (dump != NULL) {
printf("%s", dump); vshPrint(ctl, "%s", dump);
VIR_FREE(dump); VIR_FREE(dump);
} else { } else {
ret = FALSE; ret = FALSE;
...@@ -2700,7 +2700,7 @@ cmdDomXMLFromNative(vshControl *ctl, const vshCmd *cmd) ...@@ -2700,7 +2700,7 @@ cmdDomXMLFromNative(vshControl *ctl, const vshCmd *cmd)
xmlData = virConnectDomainXMLFromNative(ctl->conn, format, configData, flags); xmlData = virConnectDomainXMLFromNative(ctl->conn, format, configData, flags);
if (xmlData != NULL) { if (xmlData != NULL) {
printf("%s", xmlData); vshPrint(ctl, "%s", xmlData);
VIR_FREE(xmlData); VIR_FREE(xmlData);
} else { } else {
ret = FALSE; ret = FALSE;
...@@ -2745,7 +2745,7 @@ cmdDomXMLToNative(vshControl *ctl, const vshCmd *cmd) ...@@ -2745,7 +2745,7 @@ cmdDomXMLToNative(vshControl *ctl, const vshCmd *cmd)
configData = virConnectDomainXMLToNative(ctl->conn, format, xmlData, flags); configData = virConnectDomainXMLToNative(ctl->conn, format, xmlData, flags);
if (configData != NULL) { if (configData != NULL) {
printf("%s", configData); vshPrint(ctl, "%s", configData);
VIR_FREE(configData); VIR_FREE(configData);
} else { } else {
ret = FALSE; ret = FALSE;
...@@ -3217,7 +3217,7 @@ cmdNetworkDumpXML(vshControl *ctl, const vshCmd *cmd) ...@@ -3217,7 +3217,7 @@ cmdNetworkDumpXML(vshControl *ctl, const vshCmd *cmd)
dump = virNetworkGetXMLDesc(network, 0); dump = virNetworkGetXMLDesc(network, 0);
if (dump != NULL) { if (dump != NULL) {
printf("%s", dump); vshPrint(ctl, "%s", dump);
VIR_FREE(dump); VIR_FREE(dump);
} else { } else {
ret = FALSE; ret = FALSE;
...@@ -3806,7 +3806,7 @@ cmdInterfaceDumpXML(vshControl *ctl, const vshCmd *cmd) ...@@ -3806,7 +3806,7 @@ cmdInterfaceDumpXML(vshControl *ctl, const vshCmd *cmd)
dump = virInterfaceGetXMLDesc(iface, flags); dump = virInterfaceGetXMLDesc(iface, flags);
if (dump != NULL) { if (dump != NULL) {
printf("%s", dump); vshPrint(ctl, "%s", dump);
VIR_FREE(dump); VIR_FREE(dump);
} else { } else {
ret = FALSE; ret = FALSE;
...@@ -4094,7 +4094,7 @@ cmdNWFilterDumpXML(vshControl *ctl, const vshCmd *cmd) ...@@ -4094,7 +4094,7 @@ cmdNWFilterDumpXML(vshControl *ctl, const vshCmd *cmd)
dump = virNWFilterGetXMLDesc(nwfilter, 0); dump = virNWFilterGetXMLDesc(nwfilter, 0);
if (dump != NULL) { if (dump != NULL) {
printf("%s", dump); vshPrint(ctl, "%s", dump);
VIR_FREE(dump); VIR_FREE(dump);
} else { } else {
ret = FALSE; ret = FALSE;
...@@ -4566,7 +4566,7 @@ cmdPoolCreateAs(vshControl *ctl, const vshCmd *cmd) ...@@ -4566,7 +4566,7 @@ cmdPoolCreateAs(vshControl *ctl, const vshCmd *cmd)
return FALSE; return FALSE;
if (printXML) { if (printXML) {
printf("%s", xml); vshPrint(ctl, "%s", xml);
VIR_FREE(xml); VIR_FREE(xml);
} else { } else {
pool = virStoragePoolCreateXML(ctl->conn, xml, 0); pool = virStoragePoolCreateXML(ctl->conn, xml, 0);
...@@ -4655,7 +4655,7 @@ cmdPoolDefineAs(vshControl *ctl, const vshCmd *cmd) ...@@ -4655,7 +4655,7 @@ cmdPoolDefineAs(vshControl *ctl, const vshCmd *cmd)
return FALSE; return FALSE;
if (printXML) { if (printXML) {
printf("%s", xml); vshPrint(ctl, "%s", xml);
VIR_FREE(xml); VIR_FREE(xml);
} else { } else {
pool = virStoragePoolDefineXML(ctl->conn, xml, 0); pool = virStoragePoolDefineXML(ctl->conn, xml, 0);
...@@ -4859,7 +4859,7 @@ cmdPoolDumpXML(vshControl *ctl, const vshCmd *cmd) ...@@ -4859,7 +4859,7 @@ cmdPoolDumpXML(vshControl *ctl, const vshCmd *cmd)
dump = virStoragePoolGetXMLDesc(pool, 0); dump = virStoragePoolGetXMLDesc(pool, 0);
if (dump != NULL) { if (dump != NULL) {
printf("%s", dump); vshPrint(ctl, "%s", dump);
VIR_FREE(dump); VIR_FREE(dump);
} else { } else {
ret = FALSE; ret = FALSE;
...@@ -5925,7 +5925,7 @@ cmdVolDumpXML(vshControl *ctl, const vshCmd *cmd) ...@@ -5925,7 +5925,7 @@ cmdVolDumpXML(vshControl *ctl, const vshCmd *cmd)
dump = virStorageVolGetXMLDesc(vol, 0); dump = virStorageVolGetXMLDesc(vol, 0);
if (dump != NULL) { if (dump != NULL) {
printf("%s", dump); vshPrint(ctl, "%s", dump);
VIR_FREE(dump); VIR_FREE(dump);
} else { } else {
ret = FALSE; ret = FALSE;
...@@ -6240,7 +6240,7 @@ cmdSecretDumpXML(vshControl *ctl, const vshCmd *cmd) ...@@ -6240,7 +6240,7 @@ cmdSecretDumpXML(vshControl *ctl, const vshCmd *cmd)
xml = virSecretGetXMLDesc(secret, 0); xml = virSecretGetXMLDesc(secret, 0);
if (xml == NULL) if (xml == NULL)
goto cleanup; goto cleanup;
printf("%s", xml); vshPrint(ctl, "%s", xml);
VIR_FREE(xml); VIR_FREE(xml);
ret = TRUE; ret = TRUE;
...@@ -6350,7 +6350,7 @@ cmdSecretGetValue(vshControl *ctl, const vshCmd *cmd) ...@@ -6350,7 +6350,7 @@ cmdSecretGetValue(vshControl *ctl, const vshCmd *cmd)
vshError(ctl, "%s", _("Failed to allocate memory")); vshError(ctl, "%s", _("Failed to allocate memory"));
goto cleanup; goto cleanup;
} }
printf("%s", base64); vshPrint(ctl, "%s", base64);
memset(base64, 0, strlen(base64)); memset(base64, 0, strlen(base64));
VIR_FREE(base64); VIR_FREE(base64);
ret = TRUE; ret = TRUE;
...@@ -8681,7 +8681,7 @@ cmdSnapshotDumpXML(vshControl *ctl, const vshCmd *cmd) ...@@ -8681,7 +8681,7 @@ cmdSnapshotDumpXML(vshControl *ctl, const vshCmd *cmd)
if (!xml) if (!xml)
goto cleanup; goto cleanup;
printf("%s", xml); vshPrint(ctl, "%s", xml);
ret = TRUE; ret = TRUE;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册