From c7bb19c55c7a902e25bdd33b0d49a2ddcf62e07a Mon Sep 17 00:00:00 2001
From: Arthur de Jong <arthur@arthurdejong.org>
Date: Sat, 22 Dec 2012 21:38:26 +0000
Subject: update C coding style to a more commonly used style

git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1873 ef36b2f9-881f-0410-afb5-c4e39611909c
---
 tests/test_cfg.c | 234 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 121 insertions(+), 113 deletions(-)

(limited to 'tests/test_cfg.c')

diff --git a/tests/test_cfg.c b/tests/test_cfg.c
index ed6e8f1..4474889 100644
--- a/tests/test_cfg.c
+++ b/tests/test_cfg.c
@@ -2,7 +2,7 @@
    test_cfg.c - simple test for the cfg module
    This file is part of the nss-pam-ldapd library.
 
-   Copyright (C) 2007, 2009, 2011 Arthur de Jong
+   Copyright (C) 2007, 2009, 2011, 2012 Arthur de Jong
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -33,15 +33,15 @@
 
 static void test_xstrdup(void)
 {
-  static const char *foo="testString123";
+  static const char *foo = "testString123";
   char *bar;
-  bar=xstrdup(foo);
+  bar = xstrdup(foo);
   /* we should have a new value */
-  assert(bar!=NULL);
+  assert(bar != NULL);
   /* the contents should be the same */
-  assertstreq(foo,bar);
+  assertstreq(foo, bar);
   /* but the pointer should be different */
-  assert(foo!=bar);
+  assert(foo != bar);
   /* free memory */
   free(bar);
 }
@@ -52,99 +52,107 @@ static void test_add_uris(void)
   int i;
   /* set up config */
   cfg_defaults(&cfg);
-  assert(cfg.ldc_uris[0].uri==NULL);
+  assert(cfg.ldc_uris[0].uri == NULL);
   /* add a uri */
-  add_uri(__FILE__,__LINE__,&cfg,"ldap://localhost");
-  assert(cfg.ldc_uris[0].uri!=NULL);
-  assert(cfg.ldc_uris[1].uri==NULL);
+  add_uri(__FILE__, __LINE__, &cfg, "ldap://localhost");
+  assert(cfg.ldc_uris[0].uri != NULL);
+  assert(cfg.ldc_uris[1].uri == NULL);
   /* add some more uris */
-  for (i=1;i<NSS_LDAP_CONFIG_URI_MAX;i++)
+  for (i = 1; i < NSS_LDAP_CONFIG_URI_MAX; i++)
   {
-    add_uri(__FILE__,__LINE__,&cfg,"ldap://localhost");
-    assert(cfg.ldc_uris[i].uri!=NULL);
-    assert(cfg.ldc_uris[i+1].uri==NULL);
+    add_uri(__FILE__, __LINE__, &cfg, "ldap://localhost");
+    assert(cfg.ldc_uris[i].uri != NULL);
+    assert(cfg.ldc_uris[i + 1].uri == NULL);
   }
   /* inserting one more entry should call exit():
-  add_uri(__FILE__,__LINE__,&cfg,"ldap://localhost");
-  assert(cfg.ldc_uris[i]!=NULL);
-  assert(cfg.ldc_uris[i+1]==NULL); */
+     add_uri(__FILE__, __LINE__, &cfg, "ldap://localhost");
+     assert(cfg.ldc_uris[i] != NULL);
+     assert(cfg.ldc_uris[i + 1] == NULL); */
   /* there is no cfg_free() so we have a memory leak here */
 }
 
 static void test_parse_boolean(void)
 {
-  assert(parse_boolean(__FILE__,__LINE__,"True")==1);
-  assert(parse_boolean(__FILE__,__LINE__,"faLSe")==0);
-  assert(parse_boolean(__FILE__,__LINE__,"1")==1);
-  assert(parse_boolean(__FILE__,__LINE__,"oFF")==0);
-  assert(parse_boolean(__FILE__,__LINE__,"Yes")==1);
-  assert(parse_boolean(__FILE__,__LINE__,"No")==0);
+  assert(parse_boolean(__FILE__, __LINE__, "True") == 1);
+  assert(parse_boolean(__FILE__, __LINE__, "faLSe") == 0);
+  assert(parse_boolean(__FILE__, __LINE__, "1") == 1);
+  assert(parse_boolean(__FILE__, __LINE__, "oFF") == 0);
+  assert(parse_boolean(__FILE__, __LINE__, "Yes") == 1);
+  assert(parse_boolean(__FILE__, __LINE__, "No") == 0);
   /* most other values should call exit():
-  assert(parse_boolean(__FILE__,__LINE__,"Foo")==0); */
+     assert(parse_boolean(__FILE__, __LINE__, "Foo") == 0); */
 }
 
 static void test_parse_scope(void)
 {
-  assert(parse_scope(__FILE__,__LINE__,"sUb")==LDAP_SCOPE_SUBTREE);
-  assert(parse_scope(__FILE__,__LINE__,"subtree")==LDAP_SCOPE_SUBTREE);
-  assert(parse_scope(__FILE__,__LINE__,"ONE")==LDAP_SCOPE_ONELEVEL);
-  assert(parse_scope(__FILE__,__LINE__,"oneLevel")==LDAP_SCOPE_ONELEVEL);
-  assert(parse_scope(__FILE__,__LINE__,"base")==LDAP_SCOPE_BASE);
-  assert(parse_scope(__FILE__,__LINE__,"bASe")==LDAP_SCOPE_BASE);
+  assert(parse_scope(__FILE__, __LINE__, "sUb") == LDAP_SCOPE_SUBTREE);
+  assert(parse_scope(__FILE__, __LINE__, "subtree") == LDAP_SCOPE_SUBTREE);
+  assert(parse_scope(__FILE__, __LINE__, "ONE") == LDAP_SCOPE_ONELEVEL);
+  assert(parse_scope(__FILE__, __LINE__, "oneLevel") == LDAP_SCOPE_ONELEVEL);
+  assert(parse_scope(__FILE__, __LINE__, "base") == LDAP_SCOPE_BASE);
+  assert(parse_scope(__FILE__, __LINE__, "bASe") == LDAP_SCOPE_BASE);
   /* most other values should call exit():
-  assert(parse_scope(__FILE__,__LINE__,"BSAE")==LDAP_SCOPE_BASE); */
+     assert(parse_scope(__FILE__, __LINE__, "BSAE") == LDAP_SCOPE_BASE); */
 }
 
 static void test_parse_map(void)
 {
   /* some general assertions */
-  assert((LM_ALIASES!=LM_ETHERS)&&(LM_ALIASES!=LM_GROUP)&&(LM_ALIASES!=LM_HOSTS)&&
-         (LM_ALIASES!=LM_NETGROUP)&&(LM_ALIASES!=LM_NETWORKS)&&(LM_ALIASES!=LM_PASSWD)&&
-         (LM_ALIASES!=LM_PROTOCOLS)&&(LM_ALIASES!=LM_RPC)&&(LM_ALIASES!=LM_SERVICES)&&
-         (LM_ALIASES!=LM_SHADOW));
-  assert((LM_ETHERS!=LM_GROUP)&&(LM_ETHERS!=LM_HOSTS)&&(LM_ETHERS!=LM_NETGROUP)&&
-         (LM_ETHERS!=LM_NETWORKS)&&(LM_ETHERS!=LM_PASSWD)&&(LM_ETHERS!=LM_PROTOCOLS)&&
-         (LM_ETHERS!=LM_RPC)&&(LM_ETHERS!=LM_SERVICES)&&(LM_ETHERS!=LM_SHADOW));
-  assert((LM_GROUP!=LM_HOSTS)&&(LM_GROUP!=LM_NETGROUP)&&(LM_GROUP!=LM_NETWORKS)&&
-         (LM_GROUP!=LM_PASSWD)&&(LM_GROUP!=LM_PROTOCOLS)&&(LM_GROUP!=LM_RPC)&&
-         (LM_GROUP!=LM_SERVICES)&&(LM_GROUP!=LM_SHADOW));
-  assert((LM_HOSTS!=LM_NETGROUP)&&(LM_HOSTS!=LM_NETWORKS)&&(LM_HOSTS!=LM_PASSWD)&&
-         (LM_HOSTS!=LM_PROTOCOLS)&&(LM_HOSTS!=LM_RPC)&&(LM_HOSTS!=LM_SERVICES)&&
-         (LM_HOSTS!=LM_SHADOW));
-  assert((LM_NETGROUP!=LM_NETWORKS)&&(LM_NETGROUP!=LM_PASSWD)&&(LM_NETGROUP!=LM_PROTOCOLS)&&
-         (LM_NETGROUP!=LM_RPC)&&(LM_NETGROUP!=LM_SERVICES)&&(LM_NETGROUP!=LM_SHADOW));
-  assert((LM_NETWORKS!=LM_PASSWD)&&(LM_NETWORKS!=LM_PROTOCOLS)&&(LM_NETWORKS!=LM_RPC)&&
-         (LM_NETWORKS!=LM_SERVICES)&&(LM_NETWORKS!=LM_SHADOW));
-  assert((LM_PASSWD!=LM_PROTOCOLS)&&(LM_PASSWD!=LM_RPC)&&(LM_PASSWD!=LM_SERVICES)&&
-         (LM_PASSWD!=LM_SHADOW));
-  assert((LM_PROTOCOLS!=LM_RPC)&&(LM_PROTOCOLS!=LM_SERVICES)&&(LM_PROTOCOLS!=LM_SHADOW));
-  assert((LM_RPC!=LM_SERVICES)&&(LM_RPC!=LM_SHADOW));
-  assert((LM_SERVICES!=LM_SHADOW));
+  assert((LM_ALIASES != LM_ETHERS) && (LM_ALIASES != LM_GROUP) &&
+         (LM_ALIASES != LM_HOSTS) && (LM_ALIASES != LM_NETGROUP) &&
+         (LM_ALIASES != LM_NETWORKS) && (LM_ALIASES != LM_PASSWD) &&
+         (LM_ALIASES != LM_PROTOCOLS) && (LM_ALIASES != LM_RPC) &&
+         (LM_ALIASES != LM_SERVICES) && (LM_ALIASES != LM_SHADOW));
+  assert((LM_ETHERS != LM_GROUP) && (LM_ETHERS != LM_HOSTS) &&
+         (LM_ETHERS != LM_NETGROUP) && (LM_ETHERS != LM_NETWORKS) &&
+         (LM_ETHERS != LM_PASSWD) && (LM_ETHERS != LM_PROTOCOLS) &&
+         (LM_ETHERS != LM_RPC) && (LM_ETHERS != LM_SERVICES) &&
+         (LM_ETHERS != LM_SHADOW));
+  assert((LM_GROUP != LM_HOSTS) && (LM_GROUP != LM_NETGROUP) &&
+         (LM_GROUP != LM_NETWORKS) && (LM_GROUP != LM_PASSWD) &&
+         (LM_GROUP != LM_PROTOCOLS) && (LM_GROUP != LM_RPC) &&
+         (LM_GROUP != LM_SERVICES) && (LM_GROUP != LM_SHADOW));
+  assert((LM_HOSTS != LM_NETGROUP) && (LM_HOSTS != LM_NETWORKS) &&
+         (LM_HOSTS != LM_PASSWD) && (LM_HOSTS != LM_PROTOCOLS) &&
+         (LM_HOSTS != LM_RPC) && (LM_HOSTS != LM_SERVICES) &&
+         (LM_HOSTS != LM_SHADOW));
+  assert((LM_NETGROUP != LM_NETWORKS) && (LM_NETGROUP != LM_PASSWD) &&
+         (LM_NETGROUP != LM_PROTOCOLS) && (LM_NETGROUP != LM_RPC) &&
+         (LM_NETGROUP != LM_SERVICES) && (LM_NETGROUP != LM_SHADOW));
+  assert((LM_NETWORKS != LM_PASSWD) && (LM_NETWORKS != LM_PROTOCOLS) &&
+         (LM_NETWORKS != LM_RPC) && (LM_NETWORKS != LM_SERVICES) &&
+         (LM_NETWORKS != LM_SHADOW));
+  assert((LM_PASSWD != LM_PROTOCOLS) && (LM_PASSWD != LM_RPC) &&
+         (LM_PASSWD != LM_SERVICES) && (LM_PASSWD != LM_SHADOW));
+  assert((LM_PROTOCOLS != LM_RPC) && (LM_PROTOCOLS != LM_SERVICES) &&
+         (LM_PROTOCOLS != LM_SHADOW));
+  assert((LM_RPC != LM_SERVICES) && (LM_RPC != LM_SHADOW));
+  assert((LM_SERVICES != LM_SHADOW));
   /* test supported names */
-  assert(parse_map("alIas")==LM_ALIASES);
-  assert(parse_map("AliasES")==LM_ALIASES);
-  assert(parse_map("ether")==LM_ETHERS);
-  assert(parse_map("ethers")==LM_ETHERS);
-  assert(parse_map("group")==LM_GROUP);
-  /* assert(parse_map("groups")==LM_GROUP); */
-  assert(parse_map("host")==LM_HOSTS);
-  assert(parse_map("hosts")==LM_HOSTS);
-  assert(parse_map("netgroup")==LM_NETGROUP);
-  /* assert(parse_map("netgroups")==LM_NETGROUP); */
-  assert(parse_map("network")==LM_NETWORKS);
-  assert(parse_map("networks")==LM_NETWORKS);
-  assert(parse_map("passwd")==LM_PASSWD);
-  /* assert(parse_map("passwds")==LM_PASSWD); */
-  assert(parse_map("protocol")==LM_PROTOCOLS);
-  assert(parse_map("protocols")==LM_PROTOCOLS);
-  assert(parse_map("rpc")==LM_RPC);
-  /* assert(parse_map("rpcs")==LM_RPC); */
-  assert(parse_map("service")==LM_SERVICES);
-  assert(parse_map("services")==LM_SERVICES);
-  assert(parse_map("shadow")==LM_SHADOW);
-  /* assert(parse_map("shadows")==LM_SHADOW); */
+  assert(parse_map("alIas") == LM_ALIASES);
+  assert(parse_map("AliasES") == LM_ALIASES);
+  assert(parse_map("ether") == LM_ETHERS);
+  assert(parse_map("ethers") == LM_ETHERS);
+  assert(parse_map("group") == LM_GROUP);
+  /* assert(parse_map("groups") == LM_GROUP); */
+  assert(parse_map("host") == LM_HOSTS);
+  assert(parse_map("hosts") == LM_HOSTS);
+  assert(parse_map("netgroup") == LM_NETGROUP);
+  /* assert(parse_map("netgroups") == LM_NETGROUP); */
+  assert(parse_map("network") == LM_NETWORKS);
+  assert(parse_map("networks") == LM_NETWORKS);
+  assert(parse_map("passwd") == LM_PASSWD);
+  /* assert(parse_map("passwds") == LM_PASSWD); */
+  assert(parse_map("protocol") == LM_PROTOCOLS);
+  assert(parse_map("protocols") == LM_PROTOCOLS);
+  assert(parse_map("rpc") == LM_RPC);
+  /* assert(parse_map("rpcs") == LM_RPC); */
+  assert(parse_map("service") == LM_SERVICES);
+  assert(parse_map("services") == LM_SERVICES);
+  assert(parse_map("shadow") == LM_SHADOW);
+  /* assert(parse_map("shadows") == LM_SHADOW); */
   /* most other values should call exit():
-  assert(parse_map("publickey")==LM_SERVICES); */
+     assert(parse_map("publickey") == LM_SERVICES); */
 }
 
 static void test_parse_map_statement(void)
@@ -155,19 +163,19 @@ static void test_parse_map_statement(void)
 static void test_tokenize(void)
 {
   /* this leaks memory all over the place */
-  char *line=strdup("yes this is 1 simple line");
+  char *line = strdup("yes this is 1 simple line");
   char *str;
   int i;
-  get_boolean(__FILE__,__LINE__,__PRETTY_FUNCTION__,&line,&i);
-  assert(i==1);
-  get_strdup(__FILE__,__LINE__,__PRETTY_FUNCTION__,&line,&str);
-  assertstreq(str,"this");
-  get_strdup(__FILE__,__LINE__,__PRETTY_FUNCTION__,&line,&str);
-  assertstreq(str,"is");
-  get_int(__FILE__,__LINE__,__PRETTY_FUNCTION__,&line,&i);
-  assert(i==1);
-  get_restdup(__FILE__,__LINE__,__PRETTY_FUNCTION__,&line,&str);
-  assertstreq(str,"simple line");
+  get_boolean(__FILE__, __LINE__, __PRETTY_FUNCTION__, &line, &i);
+  assert(i == 1);
+  get_strdup(__FILE__, __LINE__, __PRETTY_FUNCTION__, &line, &str);
+  assertstreq(str, "this");
+  get_strdup(__FILE__, __LINE__, __PRETTY_FUNCTION__, &line, &str);
+  assertstreq(str, "is");
+  get_int(__FILE__, __LINE__, __PRETTY_FUNCTION__, &line, &i);
+  assert(i == 1);
+  get_restdup(__FILE__, __LINE__, __PRETTY_FUNCTION__, &line, &str);
+  assertstreq(str, "simple line");
 }
 
 extern const char *passwd_bases[];
@@ -179,41 +187,41 @@ static void test_read(void)
   FILE *fp;
   struct ldap_config cfg;
   /* write some stuff to a temporary file */
-  fp=fopen("temp.cfg","w");
-  assert(fp!=NULL);
-  fprintf(fp,"# a line of comments\n"
-             "uri ldap://127.0.0.1/\n"
-             "uri ldap:/// ldaps://127.0.0.1/\n"
-             "base dc=test, dc=tld\n"
-             "base passwd ou=Some People,dc=test,dc=tld\n"
-             "map\tpasswd uid\t\tsAMAccountName\n"
-             "map passwd homeDirectory \"${homeDirectory:-/home/$uid}\"\n"
-             "filter group (&(objeclClass=posixGroup)(gid=1*))\n"
-             "\n"
-             "scope passwd one\n");
+  fp = fopen("temp.cfg", "w");
+  assert(fp != NULL);
+  fprintf(fp, "# a line of comments\n"
+          "uri ldap://127.0.0.1/\n"
+          "uri ldap:/// ldaps://127.0.0.1/\n"
+          "base dc=test, dc=tld\n"
+          "base passwd ou=Some People,dc=test,dc=tld\n"
+          "map\tpasswd uid\t\tsAMAccountName\n"
+          "map passwd homeDirectory \"${homeDirectory:-/home/$uid}\"\n"
+          "filter group (&(objeclClass=posixGroup)(gid=1*))\n"
+          "\n"
+          "scope passwd one\n");
   fclose(fp);
   /* parse the file */
   cfg_defaults(&cfg);
-  cfg_read("temp.cfg",&cfg);
+  cfg_read("temp.cfg", &cfg);
   /* check results */
-  assert(cfg.ldc_uris[0].uri!=NULL);
-  assert(cfg.ldc_uris[1].uri!=NULL);
-  assert(cfg.ldc_uris[2].uri!=NULL);
-  assertstreq(cfg.ldc_uris[0].uri,"ldap://127.0.0.1/");
-  assertstreq(cfg.ldc_uris[1].uri,"ldap:///");
-  assertstreq(cfg.ldc_uris[2].uri,"ldaps://127.0.0.1/");
-  assert(cfg.ldc_uris[3].uri==NULL);
-  assertstreq(cfg.ldc_bases[0],"dc=test, dc=tld");
-  assertstreq(passwd_bases[0],"ou=Some People,dc=test,dc=tld");
-  assertstreq(attmap_passwd_uid,"sAMAccountName");
-  assertstreq(group_filter,"(&(objeclClass=posixGroup)(gid=1*))");
-  assert(passwd_scope==LDAP_SCOPE_ONELEVEL);
+  assert(cfg.ldc_uris[0].uri != NULL);
+  assert(cfg.ldc_uris[1].uri != NULL);
+  assert(cfg.ldc_uris[2].uri != NULL);
+  assertstreq(cfg.ldc_uris[0].uri, "ldap://127.0.0.1/");
+  assertstreq(cfg.ldc_uris[1].uri, "ldap:///");
+  assertstreq(cfg.ldc_uris[2].uri, "ldaps://127.0.0.1/");
+  assert(cfg.ldc_uris[3].uri == NULL);
+  assertstreq(cfg.ldc_bases[0], "dc=test, dc=tld");
+  assertstreq(passwd_bases[0], "ou=Some People,dc=test,dc=tld");
+  assertstreq(attmap_passwd_uid, "sAMAccountName");
+  assertstreq(group_filter, "(&(objeclClass=posixGroup)(gid=1*))");
+  assert(passwd_scope == LDAP_SCOPE_ONELEVEL);
   /* remove temporary file */
   remove("temp.cfg");
 }
 
 /* the main program... */
-int main(int UNUSED(argc),char UNUSED(*argv[]))
+int main(int UNUSED(argc), char UNUSED(*argv[]))
 {
   test_xstrdup();
   test_add_uris();
-- 
cgit v1.2.3