Re-indent resolver code with clang-format
clang-format --style file -i *.{c,h}
Test: code does not compile yet
Change-Id: I8c509de4f8558b2dd74668cf40bb73c4316dc5ad
diff --git a/resolv/sethostent.c b/resolv/sethostent.c
index a743a54..8b1c5ab 100644
--- a/resolv/sethostent.c
+++ b/resolv/sethostent.c
@@ -39,78 +39,69 @@
#endif
#endif /* LIBC_SCCS and not lint */
-#include "namespace.h"
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
#include <arpa/inet.h>
+#include <arpa/nameser.h>
#include <assert.h>
-#include <string.h>
-#include <nsswitch.h>
-#include <netdb.h>
-#include <resolv.h>
#include <errno.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <nsswitch.h>
+#include <resolv.h>
#include <stdlib.h>
+#include <string.h>
+#include <sys/param.h>
+#include "namespace.h"
#include "hostent.h"
#include "resolv_private.h"
#define ALIGNBYTES (sizeof(uintptr_t) - 1)
-#define ALIGN(p) (((uintptr_t)(p) + ALIGNBYTES) &~ ALIGNBYTES)
+#define ALIGN(p) (((uintptr_t)(p) + ALIGNBYTES) & ~ALIGNBYTES)
#ifndef _REENTRANT
-void res_close(void);
+void res_close(void);
#endif
-static struct hostent *_hf_gethtbyname2(const char *, int, struct getnamaddr *);
+static struct hostent* _hf_gethtbyname2(const char*, int, struct getnamaddr*);
void
/*ARGSUSED*/
-sethostent(int stayopen)
-{
- res_static rs = __res_get_static();
- if (rs) sethostent_r(&rs->hostf);
+sethostent(int stayopen) {
+ res_static rs = __res_get_static();
+ if (rs) sethostent_r(&rs->hostf);
}
-void
-endhostent(void)
-{
- res_static rs = __res_get_static();
- if (rs) endhostent_r(&rs->hostf);
+void endhostent(void) {
+ res_static rs = __res_get_static();
+ if (rs) endhostent_r(&rs->hostf);
}
-void
-sethostent_r(FILE **hf)
-{
- if (!*hf)
- *hf = fopen(_PATH_HOSTS, "re");
- else
- rewind(*hf);
+void sethostent_r(FILE** hf) {
+ if (!*hf)
+ *hf = fopen(_PATH_HOSTS, "re");
+ else
+ rewind(*hf);
}
-void
-endhostent_r(FILE **hf)
-{
- if (*hf) {
- (void)fclose(*hf);
- *hf = NULL;
- }
+void endhostent_r(FILE** hf) {
+ if (*hf) {
+ (void) fclose(*hf);
+ *hf = NULL;
+ }
}
/*ARGSUSED*/
-int
-_hf_gethtbyname(void *rv, void *cb_data, va_list ap)
-{
- struct hostent *hp;
- const char *name;
- int af;
- struct getnamaddr *info = rv;
+int _hf_gethtbyname(void* rv, void* cb_data, va_list ap) {
+ struct hostent* hp;
+ const char* name;
+ int af;
+ struct getnamaddr* info = rv;
- _DIAGASSERT(rv != NULL);
+ _DIAGASSERT(rv != NULL);
- name = va_arg(ap, char *);
- /* NOSTRICT skip string len */(void)va_arg(ap, int);
- af = va_arg(ap, int);
+ name = va_arg(ap, char*);
+ /* NOSTRICT skip string len */ (void) va_arg(ap, int);
+ af = va_arg(ap, int);
#if 0
{
@@ -126,160 +117,144 @@
__res_put_state(res);
}
#else
- hp = _hf_gethtbyname2(name, af, info);
+ hp = _hf_gethtbyname2(name, af, info);
#endif
- if (hp == NULL) {
- if (*info->he == NETDB_INTERNAL && errno == ENOSPC) {
- return NS_UNAVAIL; // glibc compatibility.
- }
- *info->he = HOST_NOT_FOUND;
- return NS_NOTFOUND;
- }
- return NS_SUCCESS;
+ if (hp == NULL) {
+ if (*info->he == NETDB_INTERNAL && errno == ENOSPC) {
+ return NS_UNAVAIL; // glibc compatibility.
+ }
+ *info->he = HOST_NOT_FOUND;
+ return NS_NOTFOUND;
+ }
+ return NS_SUCCESS;
}
-struct hostent *
-_hf_gethtbyname2(const char *name, int af, struct getnamaddr *info)
-{
- struct hostent *hp, hent;
- char *buf, *ptr;
- size_t len, anum, num, i;
- FILE *hf;
- char *aliases[MAXALIASES];
- char *addr_ptrs[MAXADDRS];
+struct hostent* _hf_gethtbyname2(const char* name, int af, struct getnamaddr* info) {
+ struct hostent *hp, hent;
+ char *buf, *ptr;
+ size_t len, anum, num, i;
+ FILE* hf;
+ char* aliases[MAXALIASES];
+ char* addr_ptrs[MAXADDRS];
- _DIAGASSERT(name != NULL);
+ _DIAGASSERT(name != NULL);
- hf = NULL;
- sethostent_r(&hf);
- if (hf == NULL) {
- errno = EINVAL;
- *info->he = NETDB_INTERNAL;
- return NULL;
- }
+ hf = NULL;
+ sethostent_r(&hf);
+ if (hf == NULL) {
+ errno = EINVAL;
+ *info->he = NETDB_INTERNAL;
+ return NULL;
+ }
- if ((ptr = buf = malloc(len = info->buflen)) == NULL) {
- *info->he = NETDB_INTERNAL;
- return NULL;
- }
+ if ((ptr = buf = malloc(len = info->buflen)) == NULL) {
+ *info->he = NETDB_INTERNAL;
+ return NULL;
+ }
- anum = 0; /* XXX: gcc */
- hent.h_name = NULL; /* XXX: gcc */
- hent.h_addrtype = 0; /* XXX: gcc */
- hent.h_length = 0; /* XXX: gcc */
+ anum = 0; /* XXX: gcc */
+ hent.h_name = NULL; /* XXX: gcc */
+ hent.h_addrtype = 0; /* XXX: gcc */
+ hent.h_length = 0; /* XXX: gcc */
- for (num = 0; num < MAXADDRS;) {
- info->hp->h_addrtype = af;
- info->hp->h_length = 0;
+ for (num = 0; num < MAXADDRS;) {
+ info->hp->h_addrtype = af;
+ info->hp->h_length = 0;
- hp = netbsd_gethostent_r(hf, info->hp, info->buf, info->buflen,
- info->he);
- if (hp == NULL) {
- if (*info->he == NETDB_INTERNAL && errno == ENOSPC) {
- goto nospc; // glibc compatibility.
- }
- break;
- }
+ hp = netbsd_gethostent_r(hf, info->hp, info->buf, info->buflen, info->he);
+ if (hp == NULL) {
+ if (*info->he == NETDB_INTERNAL && errno == ENOSPC) {
+ goto nospc; // glibc compatibility.
+ }
+ break;
+ }
- if (strcasecmp(hp->h_name, name) != 0) {
- char **cp;
- for (cp = hp->h_aliases; *cp != NULL; cp++)
- if (strcasecmp(*cp, name) == 0)
- break;
- if (*cp == NULL) continue;
- }
+ if (strcasecmp(hp->h_name, name) != 0) {
+ char** cp;
+ for (cp = hp->h_aliases; *cp != NULL; cp++)
+ if (strcasecmp(*cp, name) == 0) break;
+ if (*cp == NULL) continue;
+ }
- if (num == 0) {
- hent.h_addrtype = af = hp->h_addrtype;
- hent.h_length = hp->h_length;
+ if (num == 0) {
+ hent.h_addrtype = af = hp->h_addrtype;
+ hent.h_length = hp->h_length;
- HENT_SCOPY(hent.h_name, hp->h_name, ptr, len);
- for (anum = 0; hp->h_aliases[anum]; anum++) {
- if (anum >= MAXALIASES)
- goto nospc;
- HENT_SCOPY(aliases[anum], hp->h_aliases[anum],
- ptr, len);
- }
- ptr = (void *)ALIGN(ptr);
- if ((size_t)(ptr - buf) >= info->buflen)
- goto nospc;
- }
+ HENT_SCOPY(hent.h_name, hp->h_name, ptr, len);
+ for (anum = 0; hp->h_aliases[anum]; anum++) {
+ if (anum >= MAXALIASES) goto nospc;
+ HENT_SCOPY(aliases[anum], hp->h_aliases[anum], ptr, len);
+ }
+ ptr = (void*) ALIGN(ptr);
+ if ((size_t)(ptr - buf) >= info->buflen) goto nospc;
+ }
- if (num >= MAXADDRS)
- goto nospc;
- HENT_COPY(addr_ptrs[num], hp->h_addr_list[0], hp->h_length, ptr,
- len);
- num++;
- }
- endhostent_r(&hf);
+ if (num >= MAXADDRS) goto nospc;
+ HENT_COPY(addr_ptrs[num], hp->h_addr_list[0], hp->h_length, ptr, len);
+ num++;
+ }
+ endhostent_r(&hf);
- if (num == 0) {
- *info->he = HOST_NOT_FOUND;
- free(buf);
- return NULL;
- }
+ if (num == 0) {
+ *info->he = HOST_NOT_FOUND;
+ free(buf);
+ return NULL;
+ }
- hp = info->hp;
- ptr = info->buf;
- len = info->buflen;
+ hp = info->hp;
+ ptr = info->buf;
+ len = info->buflen;
- hp->h_addrtype = hent.h_addrtype;
- hp->h_length = hent.h_length;
+ hp->h_addrtype = hent.h_addrtype;
+ hp->h_length = hent.h_length;
- HENT_ARRAY(hp->h_aliases, anum, ptr, len);
- HENT_ARRAY(hp->h_addr_list, num, ptr, len);
+ HENT_ARRAY(hp->h_aliases, anum, ptr, len);
+ HENT_ARRAY(hp->h_addr_list, num, ptr, len);
- for (i = 0; i < num; i++)
- HENT_COPY(hp->h_addr_list[i], addr_ptrs[i], hp->h_length, ptr,
- len);
- hp->h_addr_list[num] = NULL;
+ for (i = 0; i < num; i++) HENT_COPY(hp->h_addr_list[i], addr_ptrs[i], hp->h_length, ptr, len);
+ hp->h_addr_list[num] = NULL;
- HENT_SCOPY(hp->h_name, hent.h_name, ptr, len);
+ HENT_SCOPY(hp->h_name, hent.h_name, ptr, len);
- for (i = 0; i < anum; i++)
- HENT_SCOPY(hp->h_aliases[i], aliases[i], ptr, len);
- hp->h_aliases[anum] = NULL;
+ for (i = 0; i < anum; i++) HENT_SCOPY(hp->h_aliases[i], aliases[i], ptr, len);
+ hp->h_aliases[anum] = NULL;
- free(buf);
- return hp;
+ free(buf);
+ return hp;
nospc:
- *info->he = NETDB_INTERNAL;
- free(buf);
- errno = ENOSPC;
- return NULL;
+ *info->he = NETDB_INTERNAL;
+ free(buf);
+ errno = ENOSPC;
+ return NULL;
}
/*ARGSUSED*/
-int
-_hf_gethtbyaddr(void *rv, void *cb_data, va_list ap)
-{
- struct hostent *hp;
- const unsigned char *addr;
- struct getnamaddr *info = rv;
- FILE *hf;
+int _hf_gethtbyaddr(void* rv, void* cb_data, va_list ap) {
+ struct hostent* hp;
+ const unsigned char* addr;
+ struct getnamaddr* info = rv;
+ FILE* hf;
- _DIAGASSERT(rv != NULL);
+ _DIAGASSERT(rv != NULL);
- addr = va_arg(ap, unsigned char *);
- info->hp->h_length = va_arg(ap, int);
- info->hp->h_addrtype = va_arg(ap, int);
+ addr = va_arg(ap, unsigned char*);
+ info->hp->h_length = va_arg(ap, int);
+ info->hp->h_addrtype = va_arg(ap, int);
- hf = NULL;
- sethostent_r(&hf);
- if (hf == NULL) {
- *info->he = NETDB_INTERNAL;
- return NS_UNAVAIL;
- }
- while ((hp = netbsd_gethostent_r(hf, info->hp, info->buf, info->buflen,
- info->he)) != NULL)
- if (!memcmp(hp->h_addr_list[0], addr, (size_t)hp->h_length))
- break;
- endhostent_r(&hf);
+ hf = NULL;
+ sethostent_r(&hf);
+ if (hf == NULL) {
+ *info->he = NETDB_INTERNAL;
+ return NS_UNAVAIL;
+ }
+ while ((hp = netbsd_gethostent_r(hf, info->hp, info->buf, info->buflen, info->he)) != NULL)
+ if (!memcmp(hp->h_addr_list[0], addr, (size_t) hp->h_length)) break;
+ endhostent_r(&hf);
- if (hp == NULL) {
- if (errno == ENOSPC) return NS_UNAVAIL; // glibc compatibility.
- *info->he = HOST_NOT_FOUND;
- return NS_NOTFOUND;
- }
- return NS_SUCCESS;
+ if (hp == NULL) {
+ if (errno == ENOSPC) return NS_UNAVAIL; // glibc compatibility.
+ *info->he = HOST_NOT_FOUND;
+ return NS_NOTFOUND;
+ }
+ return NS_SUCCESS;
}