diff options
author | Craig Tiller <ctiller@google.com> | 2015-09-22 12:33:20 -0700 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2015-09-22 12:33:20 -0700 |
commit | a82950e68318a6aab6fe894fa39f7fa616c4647b (patch) | |
tree | 7d02bd1e9e1cbae1f14ad4ad1e06d3ae81a96dfe /src/core/support/host_port.c | |
parent | 8af4c337181322cc4fb396199c90f574cfb4163f (diff) |
clang-format all core files
Diffstat (limited to 'src/core/support/host_port.c')
-rw-r--r-- | src/core/support/host_port.c | 121 |
1 files changed, 50 insertions, 71 deletions
diff --git a/src/core/support/host_port.c b/src/core/support/host_port.c index a95b9d0d81..23f65b1581 100644 --- a/src/core/support/host_port.c +++ b/src/core/support/host_port.c @@ -40,24 +40,17 @@ #include <grpc/support/log.h> #include <grpc/support/string_util.h> -int -gpr_join_host_port (char **out, const char *host, int port) -{ - if (host[0] != '[' && strchr (host, ':') != NULL) - { - /* IPv6 literals must be enclosed in brackets. */ - return gpr_asprintf (out, "[%s]:%d", host, port); - } - else - { - /* Ordinary non-bracketed host:port. */ - return gpr_asprintf (out, "%s:%d", host, port); - } +int gpr_join_host_port(char **out, const char *host, int port) { + if (host[0] != '[' && strchr(host, ':') != NULL) { + /* IPv6 literals must be enclosed in brackets. */ + return gpr_asprintf(out, "[%s]:%d", host, port); + } else { + /* Ordinary non-bracketed host:port. */ + return gpr_asprintf(out, "%s:%d", host, port); + } } -int -gpr_split_host_port (const char *name, char **host, char **port) -{ +int gpr_split_host_port(const char *name, char **host, char **port) { const char *host_start; size_t host_len; const char *port_start; @@ -65,67 +58,53 @@ gpr_split_host_port (const char *name, char **host, char **port) *host = NULL; *port = NULL; - if (name[0] == '[') - { - /* Parse a bracketed host, typically an IPv6 literal. */ - const char *rbracket = strchr (name, ']'); - if (rbracket == NULL) - { - /* Unmatched [ */ - return 0; - } - if (rbracket[1] == '\0') - { - /* ]<end> */ - port_start = NULL; - } - else if (rbracket[1] == ':') - { - /* ]:<port?> */ - port_start = rbracket + 2; - } - else - { - /* ]<invalid> */ - return 0; - } - host_start = name + 1; - host_len = (size_t) (rbracket - host_start); - if (memchr (host_start, ':', host_len) == NULL) - { - /* Require all bracketed hosts to contain a colon, because a hostname or - IPv4 address should never use brackets. */ - return 0; - } + if (name[0] == '[') { + /* Parse a bracketed host, typically an IPv6 literal. */ + const char *rbracket = strchr(name, ']'); + if (rbracket == NULL) { + /* Unmatched [ */ + return 0; + } + if (rbracket[1] == '\0') { + /* ]<end> */ + port_start = NULL; + } else if (rbracket[1] == ':') { + /* ]:<port?> */ + port_start = rbracket + 2; + } else { + /* ]<invalid> */ + return 0; } - else - { - const char *colon = strchr (name, ':'); - if (colon != NULL && strchr (colon + 1, ':') == NULL) - { - /* Exactly 1 colon. Split into host:port. */ - host_start = name; - host_len = (size_t) (colon - name); - port_start = colon + 1; - } - else - { - /* 0 or 2+ colons. Bare hostname or IPv6 litearal. */ - host_start = name; - host_len = strlen (name); - port_start = NULL; - } + host_start = name + 1; + host_len = (size_t)(rbracket - host_start); + if (memchr(host_start, ':', host_len) == NULL) { + /* Require all bracketed hosts to contain a colon, because a hostname or + IPv4 address should never use brackets. */ + return 0; } + } else { + const char *colon = strchr(name, ':'); + if (colon != NULL && strchr(colon + 1, ':') == NULL) { + /* Exactly 1 colon. Split into host:port. */ + host_start = name; + host_len = (size_t)(colon - name); + port_start = colon + 1; + } else { + /* 0 or 2+ colons. Bare hostname or IPv6 litearal. */ + host_start = name; + host_len = strlen(name); + port_start = NULL; + } + } /* Allocate return values. */ - *host = gpr_malloc (host_len + 1); - memcpy (*host, host_start, host_len); + *host = gpr_malloc(host_len + 1); + memcpy(*host, host_start, host_len); (*host)[host_len] = '\0'; - if (port_start != NULL) - { - *port = gpr_strdup (port_start); - } + if (port_start != NULL) { + *port = gpr_strdup(port_start); + } return 1; } |