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
author: Arthur de Jong <arthur@arthurdejong.org> 2012-12-22 22:38:26 +0100
committer: Arthur de Jong <arthur@arthurdejong.org> 2012-12-22 22:38:26 +0100
commit: c7bb19c55c7a902e25bdd33b0d49a2ddcf62e07a (patch)
tree: b3a75ef2719bc2f334041460fd21fbdf86a23a82 /nss/group.c
parent: d336cd6b429f8ce40c58ea287f79bbc7c23d0966 (diff)
1 files changed, 79 insertions, 79 deletions
diff --git a/nss/group.c b/nss/group.c
index 0a9ab0b..2f6d8be 100644
--- a/nss/group.c
+++ b/nss/group.c
@@ -32,83 +32,81 @@
 #include "compat/attrs.h"
 
 /* read a single group entry from the stream */
-static nss_status_t read_group(
-        TFILE *fp,struct group *result,
-        char *buffer,size_t buflen,int *errnop)
+static nss_status_t read_group(TFILE *fp, struct group *result,
+                               char *buffer, size_t buflen, int *errnop)
 {
-  int32_t tmpint32,tmp2int32,tmp3int32;
-  size_t bufptr=0;
-  memset(result,0,sizeof(struct group));
-  READ_BUF_STRING(fp,result->gr_name);
-  READ_BUF_STRING(fp,result->gr_passwd);
-  READ_INT32(fp,result->gr_gid);
-  READ_BUF_STRINGLIST(fp,result->gr_mem);
+  int32_t tmpint32, tmp2int32, tmp3int32;
+  size_t bufptr = 0;
+  memset(result, 0, sizeof(struct group));
+  READ_BUF_STRING(fp, result->gr_name);
+  READ_BUF_STRING(fp, result->gr_passwd);
+  READ_INT32(fp, result->gr_gid);
+  READ_BUF_STRINGLIST(fp, result->gr_mem);
   return NSS_STATUS_SUCCESS;
 }
 
 /* read all group entries from the stream and add
    gids of these groups to the list */
-static nss_status_t read_gids(
-        TFILE *fp,gid_t skipgroup,long int *start,long int *size,
-        gid_t **groupsp,long int limit,int *errnop)
+static nss_status_t read_gids(TFILE *fp, gid_t skipgroup, long int *start,
+                              long int *size, gid_t **groupsp,
+                              long int limit, int *errnop)
 {
-  int32_t res=(int32_t)NSLCD_RESULT_BEGIN;
-  int32_t tmpint32,tmp2int32,tmp3int32;
+  int32_t res = (int32_t)NSLCD_RESULT_BEGIN;
+  int32_t tmpint32, tmp2int32, tmp3int32;
   gid_t gid;
 #ifdef NSS_FLAVOUR_GLIBC
   gid_t *newgroups;
   long int newsize;
 #endif /* NSS_FLAVOUR_GLIBC */
   /* loop over results */
-  while (res==(int32_t)NSLCD_RESULT_BEGIN)
+  while (res == (int32_t)NSLCD_RESULT_BEGIN)
   {
     /* skip group name */
     SKIP_STRING(fp);
     /* skip passwd entry */
     SKIP_STRING(fp);
     /* read gid */
-    READ_INT32(fp,gid);
+    READ_INT32(fp, gid);
     /* skip members */
     SKIP_STRINGLIST(fp);
     /* only add the group to the list if it is not the specified group */
-    if (gid!=skipgroup)
+    if (gid != skipgroup)
     {
 #ifdef NSS_FLAVOUR_GLIBC
       /* check if we reached the limit */
-      if ( (limit>0) && (*start>=limit) )
+      if ((limit > 0) && (*start >= limit))
         return NSS_STATUS_TRYAGAIN;
       /* check if our buffer is large enough */
-      if ((*start)>=(*size))
+      if ((*start) >= (*size))
       {
         /* for some reason Glibc expects us to grow the array (completely
            different from all other NSS functions) */
         /* calculate new size */
-        newsize=2*(*size);
-        if ( (limit>0) && (*start>=limit) )
-          newsize=limit;
+        newsize = 2 * (*size);
+        if ((limit > 0) && (*start >= limit))
+          newsize = limit;
         /* allocate new memory */
-        newgroups=realloc(*groupsp,newsize*sizeof(gid_t));
-        if (newgroups==NULL)
+        newgroups = realloc(*groupsp, newsize * sizeof(gid_t));
+        if (newgroups == NULL)
           return NSS_STATUS_TRYAGAIN;
-        *groupsp=newgroups;
-        *size=newsize;
+        *groupsp = newgroups;
+        *size = newsize;
       }
 #endif /* NSS_FLAVOUR_GLIBC */
 #ifdef NSS_FLAVOUR_SOLARIS
       /* check if we reached the limit */
-      if ( (limit>0) && (*start>=limit) )
+      if ((limit > 0) && (*start >= limit))
       {
-        *errnop=1; /* this is args->erange */
+        *errnop = 1; /* this is args->erange */
         return NSS_STATUS_NOTFOUND;
       }
 #endif /* NSS_FLAVOUR_SOLARIS */
       /* add gid to list */
-      (*groupsp)[(*start)++]=gid;
+      (*groupsp)[(*start)++] = gid;
     }
-    /* read next response code
-      (don't bail out on not success since we just want to build
-      up a list) */
-    READ_INT32(fp,res);
+    /* read next response code (don't bail out on not success since we
+       just want to build up a list) */
+    READ_INT32(fp, res);
   }
   /* return the proper status code */
   return NSS_STATUS_SUCCESS;
@@ -117,23 +115,21 @@ static nss_status_t read_gids(
 #ifdef NSS_FLAVOUR_GLIBC
 
 /* get a group entry by name */
-nss_status_t _nss_ldap_getgrnam_r(
-        const char *name,struct group *result,
-        char *buffer,size_t buflen,int *errnop)
+nss_status_t _nss_ldap_getgrnam_r(const char *name, struct group *result,
+                                  char *buffer, size_t buflen, int *errnop)
 {
   NSS_BYNAME(NSLCD_ACTION_GROUP_BYNAME,
              name,
-             read_group(fp,result,buffer,buflen,errnop));
+             read_group(fp, result, buffer, buflen, errnop));
 }
 
 /* get a group entry by numeric gid */
-nss_status_t _nss_ldap_getgrgid_r(
-        gid_t gid,struct group *result,
-        char *buffer,size_t buflen,int *errnop)
+nss_status_t _nss_ldap_getgrgid_r(gid_t gid, struct group *result,
+                                  char *buffer, size_t buflen, int *errnop)
 {
   NSS_BYINT32(NSLCD_ACTION_GROUP_BYGID,
               gid,
-              read_group(fp,result,buffer,buflen,errnop));
+              read_group(fp, result, buffer, buflen, errnop));
 }
 
 /* thread-local file pointer to an ongoing request */
@@ -146,12 +142,11 @@ nss_status_t _nss_ldap_setgrent(int UNUSED(stayopen))
 }
 
 /* read a single group from the stream */
-nss_status_t _nss_ldap_getgrent_r(
-        struct group *result,
-        char *buffer,size_t buflen,int *errnop)
+nss_status_t _nss_ldap_getgrent_r(struct group *result,
+                                  char *buffer, size_t buflen, int *errnop)
 {
-  NSS_GETENT(grentfp,NSLCD_ACTION_GROUP_ALL,
-             read_group(grentfp,result,buffer,buflen,errnop));
+  NSS_GETENT(grentfp, NSLCD_ACTION_GROUP_ALL,
+             read_group(grentfp, result, buffer, buflen, errnop));
 }
 
 /* close the stream opened with setgrent() above */
@@ -172,9 +167,10 @@ nss_status_t _nss_ldap_endgrent(void)
    limit     IN     - the maxium size of the array
    *errnop   OUT    - for returning errno
 */
-nss_status_t _nss_ldap_initgroups_dyn(
-        const char *user,gid_t skipgroup,long int *start,
-        long int *size,gid_t **groupsp,long int limit,int *errnop)
+nss_status_t _nss_ldap_initgroups_dyn(const char *user, gid_t skipgroup,
+                                      long int *start, long int *size,
+                                      gid_t **groupsp, long int limit,
+                                      int *errnop)
 {
 /* temporarily map the buffer and buflen names so the check in NSS_BYNAME
    for validity of the buffer works (renaming the parameters may cause
@@ -183,7 +179,7 @@ nss_status_t _nss_ldap_initgroups_dyn(
 #define buflen *size
   NSS_BYNAME(NSLCD_ACTION_GROUP_BYMEMBER,
              user,
-             read_gids(fp,skipgroup,start,size,groupsp,limit,errnop));
+             read_gids(fp, skipgroup, start, size, groupsp, limit, errnop));
 #undef buffer
 #undef buflen
 }
@@ -193,73 +189,76 @@ nss_status_t _nss_ldap_initgroups_dyn(
 #ifdef NSS_FLAVOUR_SOLARIS
 
 #ifdef HAVE_STRUCT_NSS_XBYY_ARGS_RETURNLEN
-static char *group2str(struct group *result,char *buffer,size_t buflen)
+static char *group2str(struct group *result, char *buffer, size_t buflen)
 {
-  int res,i;
-  res=snprintf(buffer,buflen,"%s:%s:%d:",result->gr_name,result->gr_passwd,(int)result->gr_gid);
-  if ((res<0)||(res>=buflen))
+  int res, i;
+  res = snprintf(buffer, buflen, "%s:%s:%d:", result->gr_name,
+                 result->gr_passwd, (int)result->gr_gid);
+  if ((res < 0) || (res >= buflen))
     return NULL;
   if (result->gr_mem)
-    for (i=0;result->gr_mem[i];i++)
+    for (i = 0; result->gr_mem[i]; i++)
     {
       if (i)
-        strlcat(buffer,",",buflen);
-      strlcat(buffer,result->gr_mem[i],buflen);
+        strlcat(buffer, ",", buflen);
+      strlcat(buffer, result->gr_mem[i], buflen);
     }
   /* check if buffer overflowed */
-  if (strlen(buffer)>=buflen-1)
+  if (strlen(buffer) >= buflen - 1)
     return NULL;
   return buffer;
 }
 #endif /* HAVE_STRUCT_NSS_XBYY_ARGS_RETURNLEN */
 
-static nss_status_t read_result(TFILE *fp,nss_XbyY_args_t *args)
+static nss_status_t read_result(TFILE *fp, nss_XbyY_args_t *args)
 {
-  READ_RESULT(group,&args->erange);
+  READ_RESULT(group, &args->erange);
 }
 
-static nss_status_t group_getgrnam(nss_backend_t UNUSED(*be),void *args)
+static nss_status_t group_getgrnam(nss_backend_t UNUSED(*be), void *args)
 {
   NSS_BYNAME(NSLCD_ACTION_GROUP_BYNAME,
              NSS_ARGS(args)->key.name,
-             read_result(fp,args));
+             read_result(fp, args));
 }
 
-static nss_status_t group_getgrgid(nss_backend_t UNUSED(*be),void *args)
+static nss_status_t group_getgrgid(nss_backend_t UNUSED(*be), void *args)
 {
   NSS_BYINT32(NSLCD_ACTION_GROUP_BYGID,
               NSS_ARGS(args)->key.gid,
-              read_result(fp,args));
+              read_result(fp, args));
 }
 
-static nss_status_t group_setgrent(nss_backend_t *be,void UNUSED(*args))
+static nss_status_t group_setgrent(nss_backend_t *be, void UNUSED(*args))
 {
   NSS_SETENT(LDAP_BE(be)->fp);
 }
 
-static nss_status_t group_getgrent(nss_backend_t *be,void *args)
+static nss_status_t group_getgrent(nss_backend_t *be, void *args)
 {
-  NSS_GETENT(LDAP_BE(be)->fp,NSLCD_ACTION_GROUP_ALL,
-             read_result(LDAP_BE(be)->fp,args));
+  NSS_GETENT(LDAP_BE(be)->fp, NSLCD_ACTION_GROUP_ALL,
+             read_result(LDAP_BE(be)->fp, args));
 }
 
-static nss_status_t group_endgrent(nss_backend_t *be,void UNUSED(*args))
+static nss_status_t group_endgrent(nss_backend_t *be, void UNUSED(*args))
 {
   NSS_ENDENT(LDAP_BE(be)->fp);
 }
 
-static nss_status_t group_getgroupsbymember(nss_backend_t UNUSED(*be),void *args)
+static nss_status_t group_getgroupsbymember(nss_backend_t UNUSED(*be), void *args)
 {
-  struct nss_groupsbymem *argp=(struct nss_groupsbymem *)args;
-  long int start=(long int)argp->numgids;
-  gid_t skipgroup=(start>0)?argp->gid_array[0]:(gid_t)-1;
+  struct nss_groupsbymem *argp = (struct nss_groupsbymem *)args;
+  long int start = (long int)argp->numgids;
+  gid_t skipgroup = (start > 0) ? argp->gid_array[0] : (gid_t)-1;
   NSS_BYNAME(NSLCD_ACTION_GROUP_BYMEMBER,
              argp->username,
-             read_gids(fp,skipgroup,&start,NULL,(gid_t **)&argp->gid_array,argp->maxgids,&NSS_ARGS(args)->erange);
-             argp->numgids=(int)start;);
+             read_gids(fp, skipgroup, &start, NULL, (gid_t **)&argp->gid_array,
+                       argp->maxgids, &NSS_ARGS(args)->erange);
+             argp->numgids = (int)start;
+      );
 }
 
-static nss_backend_op_t group_ops[]={
+static nss_backend_op_t group_ops[] = {
   nss_ldap_destructor,
   group_endgrent,
   group_setgrent,
@@ -270,9 +269,10 @@ static nss_backend_op_t group_ops[]={
 };
 
 nss_backend_t *_nss_ldap_group_constr(const char UNUSED(*db_name),
-                  const char UNUSED(*src_name),const char UNUSED(*cfg_args))
+                                      const char UNUSED(*src_name),
+                                      const char UNUSED(*cfg_args))
 {
-  return nss_ldap_constructor(group_ops,sizeof(group_ops));
+  return nss_ldap_constructor(group_ops, sizeof(group_ops));
 }
 
 #endif /* NSS_FLAVOUR_SOLARIS */
author	Arthur de Jong <arthur@arthurdejong.org>	2012-12-22 22:38:26 +0100
committer	Arthur de Jong <arthur@arthurdejong.org>	2012-12-22 22:38:26 +0100
commit	c7bb19c55c7a902e25bdd33b0d49a2ddcf62e07a (patch)
tree	b3a75ef2719bc2f334041460fd21fbdf86a23a82 /nss/group.c
parent	d336cd6b429f8ce40c58ea287f79bbc7c23d0966 (diff)