tests: fix incorrect indentation in function body by checking first line

Signed-off-by: Shi Lei <shi_lei@massclouds.com>

diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c
index 4b4a6f764f67919d1907e02825ed10bcc69f6eb5..79152d928e12a83fdb45c44871e5e3d0d47e463f 100644 (file)
--- a/tests/qemuxml2argvmock.c
+++ b/tests/qemuxml2argvmock.c
@@ -66,7 +66,7 @@ virNumaIsAvailable(void)
 int
 virNumaGetMaxNode(void)
 {
-   return 7;
+    return 7;
 }
 
 /* We shouldn't need to mock virNumaNodeIsAvailable() and *definitely* not

diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c
index efe64110d8c294259b056d36f805c70d140b0ecf..9ff4ab3d7ba17133922c1e8c496b6e80847264b2 100644 (file)
--- a/tests/sexpr2xmltest.c
+++ b/tests/sexpr2xmltest.c
@@ -21,37 +21,37 @@ static virDomainXMLOptionPtr xmlopt;
 static int
 testCompareFiles(const char *xml, const char *sexpr)
 {
-  char *sexprData = NULL;
-  char *gotxml = NULL;
-  int ret = -1;
-  virDomainDefPtr def = NULL;
+    char *sexprData = NULL;
+    char *gotxml = NULL;
+    int ret = -1;
+    virDomainDefPtr def = NULL;
 
-  if (virTestLoadFile(sexpr, &sexprData) < 0)
-      goto fail;
+    if (virTestLoadFile(sexpr, &sexprData) < 0)
+        goto fail;
 
-  if (!(def = xenParseSxprString(sexprData,
-                                 NULL, -1, caps, xmlopt)))
-      goto fail;
+    if (!(def = xenParseSxprString(sexprData,
+                                   NULL, -1, caps, xmlopt)))
+        goto fail;
 
-  if (!virDomainDefCheckABIStability(def, def, xmlopt)) {
-      fprintf(stderr, "ABI stability check failed on %s", xml);
-      goto fail;
-  }
+    if (!virDomainDefCheckABIStability(def, def, xmlopt)) {
+        fprintf(stderr, "ABI stability check failed on %s", xml);
+        goto fail;
+    }
 
-  if (!(gotxml = virDomainDefFormat(def, caps, 0)))
-      goto fail;
+    if (!(gotxml = virDomainDefFormat(def, caps, 0)))
+        goto fail;
 
-  if (virTestCompareToFile(gotxml, xml) < 0)
-      goto fail;
+    if (virTestCompareToFile(gotxml, xml) < 0)
+        goto fail;
 
-  ret = 0;
+    ret = 0;
 
  fail:
-  VIR_FREE(sexprData);
-  VIR_FREE(gotxml);
-  virDomainDefFree(def);
+    VIR_FREE(sexprData);
+    VIR_FREE(gotxml);
+    virDomainDefFree(def);
 
-  return ret;
+    return ret;
 }
 
 struct testInfo {

diff --git a/tests/virnettlshelpers.c b/tests/virnettlshelpers.c
index 5c94f899774a88baf5ec74f3ee11a8ee488991a5..8cb8c3ee2a398d1489ce08898c868583ba772a41 100644 (file)
--- a/tests/virnettlshelpers.c
+++ b/tests/virnettlshelpers.c
@@ -126,19 +126,19 @@ static void testTLSDerEncode(ASN1_TYPE src,
                              const char *src_name,
                              gnutls_datum_t * res)
 {
-  int size;
-  char *data = NULL;
+    int size;
+    char *data = NULL;
 
-  size = 0;
-  asn1_der_coding(src, src_name, NULL, &size, NULL);
+    size = 0;
+    asn1_der_coding(src, src_name, NULL, &size, NULL);
 
-  if (VIR_ALLOC_N(data, size) < 0)
-      abort();
+    if (VIR_ALLOC_N(data, size) < 0)
+        abort();
 
-  asn1_der_coding(src, src_name, data, &size, NULL);
+    asn1_der_coding(src, src_name, data, &size, NULL);
 
-  res->data = (unsigned char *)data;
-  res->size = size;
+    res->data = (unsigned char *)data;
+    res->size = size;
 }
 
 

diff --git a/tests/virshtest.c b/tests/virshtest.c
index 10cd0d356b137843ec5d826f03ce1b39f9d28f63..078c6bfdca76b1b00cc617953acec55f127ba761 100644 (file)
--- a/tests/virshtest.c
+++ b/tests/virshtest.c
@@ -44,18 +44,18 @@ static const char *domstate_fc4 = "running\n\n";
 static int testFilterLine(char *buffer,
                           const char *toRemove)
 {
-  char *start;
-  char *end;
-
-  if (!(start = strstr(buffer, toRemove)))
-    return -1;
-
-  if (!(end = strstr(start+1, "\n"))) {
-    *start = '\0';
-  } else {
-    memmove(start, end, strlen(end)+1);
-  }
-  return 0;
+    char *start;
+    char *end;
+
+    if (!(start = strstr(buffer, toRemove)))
+      return -1;
+
+    if (!(end = strstr(start+1, "\n"))) {
+      *start = '\0';
+    } else {
+      memmove(start, end, strlen(end)+1);
+    }
+    return 0;
 }
 
 static int
@@ -96,31 +96,31 @@ static char *custom_uri;
 
 static int testCompareListDefault(const void *data ATTRIBUTE_UNUSED)
 {
-  const char *const argv[] = { VIRSH_DEFAULT, "list", NULL };
-  const char *exp = "\
+    const char *const argv[] = { VIRSH_DEFAULT, "list", NULL };
+    const char *exp = "\
  Id   Name   State    \n\
 ----------------------\n\
  1    test   running  \n\
 \n";
-  return testCompareOutputLit(exp, NULL, argv);
+    return testCompareOutputLit(exp, NULL, argv);
 }
 
 static int testCompareListCustom(const void *data ATTRIBUTE_UNUSED)
 {
-  const char *const argv[] = { VIRSH_CUSTOM, "list", NULL };
-  const char *exp = "\
+    const char *const argv[] = { VIRSH_CUSTOM, "list", NULL };
+    const char *exp = "\
  Id   Name   State    \n\
 ----------------------\n\
  1    fv0    running  \n\
  2    fc4    running  \n\
 \n";
-  return testCompareOutputLit(exp, NULL, argv);
+    return testCompareOutputLit(exp, NULL, argv);
 }
 
 static int testCompareNodeinfoDefault(const void *data ATTRIBUTE_UNUSED)
 {
-  const char *const argv[] = { VIRSH_DEFAULT, "nodeinfo", NULL };
-  const char *exp = "\
+    const char *const argv[] = { VIRSH_DEFAULT, "nodeinfo", NULL };
+    const char *exp = "\
 CPU model:           i686\n\
 CPU(s):              16\n\
 CPU frequency:       1400 MHz\n\
@@ -130,17 +130,17 @@ Thread(s) per core:  2\n\
 NUMA cell(s):        2\n\
 Memory size:         3145728 KiB\n\
 \n";
-  return testCompareOutputLit(exp, NULL, argv);
+    return testCompareOutputLit(exp, NULL, argv);
 }
 
 static int testCompareNodeinfoCustom(const void *data ATTRIBUTE_UNUSED)
 {
-  const char *const argv[] = {
-    VIRSH_CUSTOM,
-    "nodeinfo",
-    NULL
-  };
-  const char *exp = "\
+    const char *const argv[] = {
+        VIRSH_CUSTOM,
+        "nodeinfo",
+        NULL
+    };
+    const char *exp = "\
 CPU model:           i986\n\
 CPU(s):              50\n\
 CPU frequency:       6000 MHz\n\
@@ -150,91 +150,91 @@ Thread(s) per core:  2\n\
 NUMA cell(s):        4\n\
 Memory size:         8192000 KiB\n\
 \n";
-  return testCompareOutputLit(exp, NULL, argv);
+    return testCompareOutputLit(exp, NULL, argv);
 }
 
 static int testCompareDominfoByID(const void *data ATTRIBUTE_UNUSED)
 {
-  const char *const argv[] = { VIRSH_CUSTOM, "dominfo", "2", NULL };
-  const char *exp = dominfo_fc4;
-  return testCompareOutputLit(exp, "\nCPU time:", argv);
+    const char *const argv[] = { VIRSH_CUSTOM, "dominfo", "2", NULL };
+    const char *exp = dominfo_fc4;
+    return testCompareOutputLit(exp, "\nCPU time:", argv);
 }
 
 static int testCompareDominfoByUUID(const void *data ATTRIBUTE_UNUSED)
 {
-  const char *const argv[] = { VIRSH_CUSTOM, "dominfo", DOM_UUID, NULL };
-  const char *exp = dominfo_fc4;
-  return testCompareOutputLit(exp, "\nCPU time:", argv);
+    const char *const argv[] = { VIRSH_CUSTOM, "dominfo", DOM_UUID, NULL };
+    const char *exp = dominfo_fc4;
+    return testCompareOutputLit(exp, "\nCPU time:", argv);
 }
 
 static int testCompareDominfoByName(const void *data ATTRIBUTE_UNUSED)
 {
-  const char *const argv[] = { VIRSH_CUSTOM, "dominfo", "fc4", NULL };
-  const char *exp = dominfo_fc4;
-  return testCompareOutputLit(exp, "\nCPU time:", argv);
+    const char *const argv[] = { VIRSH_CUSTOM, "dominfo", "fc4", NULL };
+    const char *exp = dominfo_fc4;
+    return testCompareOutputLit(exp, "\nCPU time:", argv);
 }
 
 static int testCompareDomuuidByID(const void *data ATTRIBUTE_UNUSED)
 {
-  const char *const argv[] = { VIRSH_CUSTOM, "domuuid", "2", NULL };
-  const char *exp = domuuid_fc4;
-  return testCompareOutputLit(exp, NULL, argv);
+    const char *const argv[] = { VIRSH_CUSTOM, "domuuid", "2", NULL };
+    const char *exp = domuuid_fc4;
+    return testCompareOutputLit(exp, NULL, argv);
 }
 
 static int testCompareDomuuidByName(const void *data ATTRIBUTE_UNUSED)
 {
-  const char *const argv[] = { VIRSH_CUSTOM, "domuuid", "fc4", NULL };
-  const char *exp = domuuid_fc4;
-  return testCompareOutputLit(exp, NULL, argv);
+    const char *const argv[] = { VIRSH_CUSTOM, "domuuid", "fc4", NULL };
+    const char *exp = domuuid_fc4;
+    return testCompareOutputLit(exp, NULL, argv);
 }
 
 static int testCompareDomidByName(const void *data ATTRIBUTE_UNUSED)
 {
-  const char *const argv[] = { VIRSH_CUSTOM, "domid", "fc4", NULL };
-  const char *exp = domid_fc4;
-  return testCompareOutputLit(exp, NULL, argv);
+    const char *const argv[] = { VIRSH_CUSTOM, "domid", "fc4", NULL };
+    const char *exp = domid_fc4;
+    return testCompareOutputLit(exp, NULL, argv);
 }
 
 static int testCompareDomidByUUID(const void *data ATTRIBUTE_UNUSED)
 {
-  const char *const argv[] = { VIRSH_CUSTOM, "domid", DOM_UUID, NULL };
-  const char *exp = domid_fc4;
-  return testCompareOutputLit(exp, NULL, argv);
+    const char *const argv[] = { VIRSH_CUSTOM, "domid", DOM_UUID, NULL };
+    const char *exp = domid_fc4;
+    return testCompareOutputLit(exp, NULL, argv);
 }
 
 static int testCompareDomnameByID(const void *data ATTRIBUTE_UNUSED)
 {
-  const char *const argv[] = { VIRSH_CUSTOM, "domname", "2", NULL };
-  const char *exp = domname_fc4;
-  return testCompareOutputLit(exp, NULL, argv);
+    const char *const argv[] = { VIRSH_CUSTOM, "domname", "2", NULL };
+    const char *exp = domname_fc4;
+    return testCompareOutputLit(exp, NULL, argv);
 }
 
 static int testCompareDomnameByUUID(const void *data ATTRIBUTE_UNUSED)
 {
-  const char *const argv[] = { VIRSH_CUSTOM, "domname", DOM_UUID, NULL };
-  const char *exp = domname_fc4;
-  return testCompareOutputLit(exp, NULL, argv);
+    const char *const argv[] = { VIRSH_CUSTOM, "domname", DOM_UUID, NULL };
+    const char *exp = domname_fc4;
+    return testCompareOutputLit(exp, NULL, argv);
 }
 
 static int testCompareDomstateByID(const void *data ATTRIBUTE_UNUSED)
 {
-  const char *const argv[] = { VIRSH_CUSTOM, "domstate", "2", NULL };
-  const char *exp = domstate_fc4;
-  return testCompareOutputLit(exp, NULL, argv);
+    const char *const argv[] = { VIRSH_CUSTOM, "domstate", "2", NULL };
+    const char *exp = domstate_fc4;
+    return testCompareOutputLit(exp, NULL, argv);
 }
 
 static int testCompareDomstateByUUID(const void *data ATTRIBUTE_UNUSED)
 {
-  const char *const argv[] = { VIRSH_CUSTOM, "domstate", DOM_UUID, NULL };
-  const char *exp = domstate_fc4;
-  return testCompareOutputLit(exp, NULL, argv);
+    const char *const argv[] = { VIRSH_CUSTOM, "domstate", DOM_UUID, NULL };
+    const char *exp = domstate_fc4;
+    return testCompareOutputLit(exp, NULL, argv);
 }
 
 static int testCompareDomstateByName(const void *data ATTRIBUTE_UNUSED)
 {
-  const char *const argv[] = { VIRSH_CUSTOM, "domstate", "fc4", NULL };
-  const char *exp = domstate_fc4;
-  return testCompareOutputLit(exp, NULL, argv);
+    const char *const argv[] = { VIRSH_CUSTOM, "domstate", "fc4", NULL };
+    const char *exp = domstate_fc4;
+    return testCompareOutputLit(exp, NULL, argv);
 }
 
 struct testInfo {

diff --git a/tests/xml2sexprtest.c b/tests/xml2sexprtest.c
index 3e4d1d165e2d991c3611d31c80b78b5e74cd648d..98092d8a4b76fc5cae9a9b40e4f88517811f452b 100644 (file)
--- a/tests/xml2sexprtest.c
+++ b/tests/xml2sexprtest.c
@@ -22,32 +22,32 @@ static virDomainXMLOptionPtr xmlopt;
 static int
 testCompareFiles(const char *xml, const char *sexpr)
 {
-  char *gotsexpr = NULL;
-  int ret = -1;
-  virDomainDefPtr def = NULL;
+    char *gotsexpr = NULL;
+    int ret = -1;
+    virDomainDefPtr def = NULL;
 
-  if (!(def = virDomainDefParseFile(xml, caps, xmlopt, NULL,
-                                    VIR_DOMAIN_DEF_PARSE_INACTIVE)))
-      goto fail;
+    if (!(def = virDomainDefParseFile(xml, caps, xmlopt, NULL,
+                                      VIR_DOMAIN_DEF_PARSE_INACTIVE)))
+        goto fail;
 
-  if (!virDomainDefCheckABIStability(def, def, xmlopt)) {
-      fprintf(stderr, "ABI stability check failed on %s", xml);
-      goto fail;
-  }
+    if (!virDomainDefCheckABIStability(def, def, xmlopt)) {
+        fprintf(stderr, "ABI stability check failed on %s", xml);
+        goto fail;
+    }
 
-  if (!(gotsexpr = xenFormatSxpr(NULL, def)))
-      goto fail;
+    if (!(gotsexpr = xenFormatSxpr(NULL, def)))
+        goto fail;
 
-  if (virTestCompareToFile(gotsexpr, sexpr) < 0)
-      goto fail;
+    if (virTestCompareToFile(gotsexpr, sexpr) < 0)
+        goto fail;
 
-  ret = 0;
+    ret = 0;
 
  fail:
-  VIR_FREE(gotsexpr);
-  virDomainDefFree(def);
+    VIR_FREE(gotsexpr);
+    virDomainDefFree(def);
 
-  return ret;
+    return ret;
 }
 
 struct testInfo {