diff options
| 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/solnss.h | |
| parent | d336cd6b429f8ce40c58ea287f79bbc7c23d0966 (diff) | |
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
Diffstat (limited to 'nss/solnss.h')
| -rw-r--r-- | nss/solnss.h | 105 |
1 files changed, 53 insertions, 52 deletions
diff --git a/nss/solnss.h b/nss/solnss.h index b71b2ec..a01d520 100644 --- a/nss/solnss.h +++ b/nss/solnss.h @@ -26,87 +26,88 @@ /* extra definitions we need (Solaris NSS functions don't pass errno) also clear the output values */ #ifdef HAVE_STRUCT_NSS_XBYY_ARGS_RETURNLEN -#define NSS_EXTRA_DEFS \ - int *errnop=&(errno); \ - NSS_ARGS(args)->returnval=NULL; \ - NSS_ARGS(args)->returnlen=0; \ - NSS_ARGS(args)->erange=0; \ - NSS_ARGS(args)->h_errno=0; +#define NSS_EXTRA_DEFS \ + int *errnop = &(errno); \ + NSS_ARGS(args)->returnval = NULL; \ + NSS_ARGS(args)->returnlen = 0; \ + NSS_ARGS(args)->erange = 0; \ + NSS_ARGS(args)->h_errno = 0; #else /* not HAVE_STRUCT_NSS_XBYY_ARGS_RETURNLEN */ -#define NSS_EXTRA_DEFS \ - int *errnop=&(errno); \ - NSS_ARGS(args)->returnval=NULL; \ - NSS_ARGS(args)->erange=0; \ - NSS_ARGS(args)->h_errno=0; +#define NSS_EXTRA_DEFS \ + int *errnop = &(errno); \ + NSS_ARGS(args)->returnval = NULL; \ + NSS_ARGS(args)->erange = 0; \ + NSS_ARGS(args)->h_errno = 0; #endif /* not HAVE_STRUCT_NSS_XBYY_ARGS_RETURNLEN */ /* check validity of passed buffer (Solaris flavour) */ #define NSS_BUFCHECK \ - if ((NSS_ARGS(args)->buf.buffer==NULL)||(NSS_ARGS(args)->buf.buflen<=0)) \ + if ((NSS_ARGS(args)->buf.buffer == NULL) || \ + (NSS_ARGS(args)->buf.buflen <= 0)) \ { \ - NSS_ARGS(args)->erange=1; \ + NSS_ARGS(args)->erange = 1; \ return NSS_STATUS_TRYAGAIN; \ } /* wrapper function body for read_xxxent that does the buffer handling, return code handling and conversion to strings for nscd (also see READ_RESULT_STRING below) */ -#define READ_RESULT(ent,extra...) \ +#define READ_RESULT(ent, extra...) \ nss_status_t retv; \ - READ_RESULT_STRING(ent,##extra) \ + READ_RESULT_STRING(ent, ##extra) \ /* read the entry */ \ - retv=read_##ent(fp,args->buf.result,args->buf.buffer,args->buf.buflen,##extra); \ - if (retv!=NSS_STATUS_SUCCESS) \ - return retv; \ - args->returnval=args->buf.result; \ + retv = read_##ent(fp, args->buf.result, args->buf.buffer, \ + args->buf.buflen, ##extra); \ + if (retv != NSS_STATUS_SUCCESS) \ + return retv; \ + args->returnval = args->buf.result; \ return NSS_STATUS_SUCCESS; /* provide result handling for when libc (or nscd) expects the returned values to be in string format */ #ifdef HAVE_STRUCT_NSS_XBYY_ARGS_RETURNLEN -#define READ_RESULT_STRING(ent,extra...) \ - struct ent result; \ - char *buffer; \ - /* try to return in string format if requested */ \ - if (args->buf.result==NULL) \ - { \ - /* read the entry into a temporary buffer */ \ - buffer=(char *)malloc(args->buf.buflen); \ - if (buffer==NULL) \ - return NSS_STATUS_UNAVAIL; \ - retv=read_##ent(fp,&result,buffer,args->buf.buflen,##extra); \ - /* format to string */ \ - if (retv==NSS_STATUS_SUCCESS) \ - if (ent##2str(&result,args->buf.buffer,args->buf.buflen)==NULL) \ - { \ - args->erange=1; \ - retv=NSS_NOTFOUND; \ - } \ - /* clean up and return result */ \ - free(buffer); \ - if (retv!=NSS_STATUS_SUCCESS) \ - return retv; \ - args->returnval=args->buf.buffer; \ - args->returnlen=strlen(args->returnval); \ - return NSS_STATUS_SUCCESS; \ +#define READ_RESULT_STRING(ent, extra...) \ + struct ent result; \ + char *buffer; \ + /* try to return in string format if requested */ \ + if (args->buf.result == NULL) \ + { \ + /* read the entry into a temporary buffer */ \ + buffer = (char *)malloc(args->buf.buflen); \ + if (buffer == NULL) \ + return NSS_STATUS_UNAVAIL; \ + retv = read_##ent(fp, &result, buffer, args->buf.buflen, ##extra); \ + /* format to string */ \ + if (retv == NSS_STATUS_SUCCESS) \ + if (ent##2str(&result, args->buf.buffer, args->buf.buflen) == NULL) \ + { \ + args->erange = 1; \ + retv = NSS_NOTFOUND; \ + } \ + /* clean up and return result */ \ + free(buffer); \ + if (retv != NSS_STATUS_SUCCESS) \ + return retv; \ + args->returnval = args->buf.buffer; \ + args->returnlen = strlen(args->returnval); \ + return NSS_STATUS_SUCCESS; \ } #else /* not HAVE_STRUCT_NSS_XBYY_ARGS_RETURNLEN */ -#define READ_RESULT_STRING(ent,extra...) ; +#define READ_RESULT_STRING(ent, extra...) ; #endif /* not HAVE_STRUCT_NSS_XBYY_ARGS_RETURNLEN */ /* this is the backend structure for Solaris */ -struct nss_ldap_backend -{ - nss_backend_op_t *ops; /* function-pointer table */ - int n_ops; /* number of function pointers */ - TFILE *fp; /* the file pointer for {set,get,end}ent() functions */ +struct nss_ldap_backend { + nss_backend_op_t *ops; /* function-pointer table */ + int n_ops; /* number of function pointers */ + TFILE *fp; /* file pointer for {set,get,end}ent() functions */ }; /* constructor for LDAP backends */ -nss_backend_t *nss_ldap_constructor(nss_backend_op_t *ops,size_t sizeofops); +nss_backend_t *nss_ldap_constructor(nss_backend_op_t *ops, size_t sizeofops); /* destructor for LDAP backends */ -nss_status_t nss_ldap_destructor(nss_backend_t *be,void UNUSED(*args)); +nss_status_t nss_ldap_destructor(nss_backend_t *be, void UNUSED(*args)); #endif /* NSS_FLAVOUR_SOLARIS */ #endif /* not NSS__COMMON_H */ |