From f943c4ed9faad1a9cad18269eabd2fd456e82c20 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Mon, 28 Jul 2008 09:01:49 -0400 Subject: [PATCH] Unindent a bunch of code in get_local_group. Signed-off-by: Anders Kaseorg --- nonlocal-group.c | 59 ++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/nonlocal-group.c b/nonlocal-group.c index c8e8d7b..9d2bfa0 100644 --- a/nonlocal-group.c +++ b/nonlocal-group.c @@ -157,38 +157,39 @@ get_local_group(const char *name, struct group *grp, char *buffer, size_t buflen break; } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0); - if (status == NSS_STATUS_SUCCESS) { - n = snprintf(buffer, buflen, "%s", gbuf.gr_name); - if (n < 0 || n >= buflen) { - *errnop = ERANGE; - status = NSS_STATUS_TRYAGAIN; - goto get_local_group_done; - } - grp->gr_name = buffer; - buffer += n; - buflen -= n; - - n = snprintf(buffer, buflen, "%s", gbuf.gr_passwd); - if (n < 0 || n >= buflen) { - *errnop = ERANGE; - status = NSS_STATUS_TRYAGAIN; - goto get_local_group_done; - } - grp->gr_passwd = buffer; - buffer += n; - buflen -= n; + if (status != NSS_STATUS_SUCCESS) + goto get_local_group_done; - grp->gr_gid = gbuf.gr_gid; + n = snprintf(buffer, buflen, "%s", gbuf.gr_name); + if (n < 0 || n >= buflen) { + *errnop = ERANGE; + status = NSS_STATUS_TRYAGAIN; + goto get_local_group_done; + } + grp->gr_name = buffer; + buffer += n; + buflen -= n; + + n = snprintf(buffer, buflen, "%s", gbuf.gr_passwd); + if (n < 0 || n >= buflen) { + *errnop = ERANGE; + status = NSS_STATUS_TRYAGAIN; + goto get_local_group_done; + } + grp->gr_passwd = buffer; + buffer += n; + buflen -= n; - if (buflen < sizeof(void *)) { - *errnop = ERANGE; - status = NSS_STATUS_TRYAGAIN; - goto get_local_group_done; - } - *(void **)buffer = NULL; - buffer += sizeof(void *); - buflen -= sizeof(void *); + grp->gr_gid = gbuf.gr_gid; + + if (buflen < sizeof(void *)) { + *errnop = ERANGE; + status = NSS_STATUS_TRYAGAIN; + goto get_local_group_done; } + *(void **)buffer = NULL; + buffer += sizeof(void *); + buflen -= sizeof(void *); get_local_group_done: free(buf); -- 2.45.0