On 2012年12月03日 21:46, Peter Krempa wrote:
---
  src/conf/storage_conf.c  | 2 +-
  src/util/virtypedparam.c | 6 ++----
  tools/virsh-domain.c     | 3 +--
  3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index 3fdc5b6..2d72d06 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -441,7 +441,7 @@ virStoragePoolDefParseAuthChap(xmlXPathContextPtr ctxt,

  static int
  virStoragePoolDefParseAuthCephx(xmlXPathContextPtr ctxt,
-                               virStoragePoolAuthCephxPtr auth) {
+                                virStoragePoolAuthCephxPtr auth) {
      char *uuid = NULL;
      auth->username = virXPathString("string(./auth/@username)", ctxt);
      if (auth->username == NULL) {
diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c
index 0b7a268..7f0a44b 100644
--- a/src/util/virtypedparam.c
+++ b/src/util/virtypedparam.c
@@ -250,11 +250,9 @@ virTypedParameterAssignFromStr(virTypedParameterPtr param, 
const char *name,
          }
          break;
      case VIR_TYPED_PARAM_BOOLEAN:
-        if (STRCASEEQ(val, "true") ||
-            STREQ(val, "1")) {
+        if (STRCASEEQ(val, "true") || STREQ(val, "1")) {
              param->value.b = true;
-        } else if (STRCASEEQ(val, "false") ||
-                 STREQ(val, "0")) {
+        } else if (STRCASEEQ(val, "false") || STREQ(val, "0")) {
              param->value.b = false;
          } else {
              virReportError(VIR_ERR_INVALID_ARG,
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index f12777c..73ebba9 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -3576,8 +3576,7 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd)
      /* Print SchedulerType */
      schedulertype = virDomainGetSchedulerType(dom,&nparams);
      if (schedulertype != NULL) {
-        vshPrint(ctl, "%-15s: %s\n", _("Scheduler"),
-             schedulertype);
+        vshPrint(ctl, "%-15s: %s\n", _("Scheduler"), schedulertype);
          VIR_FREE(schedulertype);
      } else {
          vshPrint(ctl, "%-15s: %s\n", _("Scheduler"), _("Unknown"));

ACK

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Reply via email to