diff options
author | Arthur de Jong <arthur@arthurdejong.org> | 2012-12-22 21:38:26 +0000 |
---|---|---|
committer | Arthur de Jong <arthur@arthurdejong.org> | 2012-12-22 21:38:26 +0000 |
commit | c7bb19c55c7a902e25bdd33b0d49a2ddcf62e07a (patch) | |
tree | b3a75ef2719bc2f334041460fd21fbdf86a23a82 /nss/protocols.c | |
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/protocols.c')
-rw-r--r-- | nss/protocols.c | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/nss/protocols.c b/nss/protocols.c index 4c9279f..b4c349e 100644 --- a/nss/protocols.c +++ b/nss/protocols.c @@ -31,39 +31,39 @@ #include "compat/attrs.h" /* read a single protocol entry from the stream */ -static nss_status_t read_protoent( - TFILE *fp,struct protoent *result, - char *buffer,size_t buflen,int *errnop) +static nss_status_t read_protoent(TFILE *fp, struct protoent *result, + char *buffer, size_t buflen, int *errnop) { - int32_t tmpint32,tmp2int32,tmp3int32; - size_t bufptr=0; - memset(result,0,sizeof(struct protoent)); - READ_BUF_STRING(fp,result->p_name); - READ_BUF_STRINGLIST(fp,result->p_aliases); - READ_INT32(fp,result->p_proto); + int32_t tmpint32, tmp2int32, tmp3int32; + size_t bufptr = 0; + memset(result, 0, sizeof(struct protoent)); + READ_BUF_STRING(fp, result->p_name); + READ_BUF_STRINGLIST(fp, result->p_aliases); + READ_INT32(fp, result->p_proto); return NSS_STATUS_SUCCESS; } #ifdef NSS_FLAVOUR_GLIBC /* get a protocol entry by name */ -nss_status_t _nss_ldap_getprotobyname_r( - const char *name,struct protoent *result, - char *buffer,size_t buflen,int *errnop) +nss_status_t _nss_ldap_getprotobyname_r(const char *name, + struct protoent *result, + char *buffer, size_t buflen, + int *errnop) { NSS_BYNAME(NSLCD_ACTION_PROTOCOL_BYNAME, name, - read_protoent(fp,result,buffer,buflen,errnop)); + read_protoent(fp, result, buffer, buflen, errnop)); } /* get a protocol entry by number */ -nss_status_t _nss_ldap_getprotobynumber_r( - int number,struct protoent *result, - char *buffer,size_t buflen,int *errnop) +nss_status_t _nss_ldap_getprotobynumber_r(int number, struct protoent *result, + char *buffer, size_t buflen, + int *errnop) { NSS_BYINT32(NSLCD_ACTION_PROTOCOL_BYNUMBER, number, - read_protoent(fp,result,buffer,buflen,errnop)); + read_protoent(fp, result, buffer, buflen, errnop)); } /* thread-local file pointer to an ongoing request */ @@ -76,12 +76,11 @@ nss_status_t _nss_ldap_setprotoent(int UNUSED(stayopen)) } /* get a single protocol entry */ -nss_status_t _nss_ldap_getprotoent_r( - struct protoent *result, - char *buffer,size_t buflen,int *errnop) +nss_status_t _nss_ldap_getprotoent_r(struct protoent *result, + char *buffer, size_t buflen, int *errnop) { - NSS_GETENT(protoentfp,NSLCD_ACTION_PROTOCOL_ALL, - read_protoent(protoentfp,result,buffer,buflen,errnop)); + NSS_GETENT(protoentfp, NSLCD_ACTION_PROTOCOL_ALL, + read_protoent(protoentfp, result, buffer, buflen, errnop)); } /* close the stream opened by setprotoent() above */ @@ -95,60 +94,60 @@ nss_status_t _nss_ldap_endprotoent(void) #ifdef NSS_FLAVOUR_SOLARIS #ifdef HAVE_STRUCT_NSS_XBYY_ARGS_RETURNLEN -static char *protoent2str(struct protoent *result,char *buffer,size_t buflen) +static char *protoent2str(struct protoent *result, char *buffer, size_t buflen) { - int res,i; - res=snprintf(buffer,buflen,"%s\t\t%d",result->p_name,result->p_proto); - if ((res<0)||(res>=buflen)) + int res, i; + res = snprintf(buffer, buflen, "%s\t\t%d", result->p_name, result->p_proto); + if ((res < 0) || (res >= buflen)) return NULL; if (result->p_aliases) - for (i=0;result->p_aliases[i];i++) + for (i = 0; result->p_aliases[i]; i++) { - strlcat(buffer," ",buflen); - strlcat(buffer,result->p_aliases[i],buflen); + strlcat(buffer, " ", buflen); + strlcat(buffer, result->p_aliases[i], buflen); } - 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(protoent,&args->erange); + READ_RESULT(protoent, &args->erange); } -static nss_status_t protocols_getprotobyname(nss_backend_t UNUSED(*be),void *args) +static nss_status_t protocols_getprotobyname(nss_backend_t UNUSED(*be), void *args) { NSS_BYNAME(NSLCD_ACTION_PROTOCOL_BYNAME, NSS_ARGS(args)->key.name, - read_result(fp,args)); + read_result(fp, args)); } -static nss_status_t protocols_getprotobynumber(nss_backend_t UNUSED(*be),void *args) +static nss_status_t protocols_getprotobynumber(nss_backend_t UNUSED(*be), void *args) { NSS_BYINT32(NSLCD_ACTION_PROTOCOL_BYNUMBER, NSS_ARGS(args)->key.number, - read_result(fp,args)); + read_result(fp, args)); } -static nss_status_t protocols_setprotoent(nss_backend_t *be,void UNUSED(*args)) +static nss_status_t protocols_setprotoent(nss_backend_t *be, void UNUSED(*args)) { NSS_SETENT(LDAP_BE(be)->fp); } -static nss_status_t protocols_getprotoent(nss_backend_t *be,void *args) +static nss_status_t protocols_getprotoent(nss_backend_t *be, void *args) { - NSS_GETENT(LDAP_BE(be)->fp,NSLCD_ACTION_PROTOCOL_ALL, - read_result(LDAP_BE(be)->fp,args)); + NSS_GETENT(LDAP_BE(be)->fp, NSLCD_ACTION_PROTOCOL_ALL, + read_result(LDAP_BE(be)->fp, args)); } -static nss_status_t protocols_endprotoent(nss_backend_t *be,void UNUSED(*args)) +static nss_status_t protocols_endprotoent(nss_backend_t *be, void UNUSED(*args)) { NSS_ENDENT(LDAP_BE(be)->fp); } -static nss_backend_op_t protocols_ops[]={ +static nss_backend_op_t protocols_ops[] = { nss_ldap_destructor, protocols_endprotoent, protocols_setprotoent, @@ -158,9 +157,10 @@ static nss_backend_op_t protocols_ops[]={ }; nss_backend_t *_nss_ldap_protocols_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(protocols_ops,sizeof(protocols_ops)); + return nss_ldap_constructor(protocols_ops, sizeof(protocols_ops)); } #endif /* NSS_FLAVOUR_SOLARIS */ |