Clang format

pull/7665/head
murgatroid99 9 years ago
parent 165e5066e4
commit 7e924a0dd4
  1. 2
      src/core/lib/iomgr/ev_epoll_linux.h
  2. 2
      src/core/lib/iomgr/pollset_set_windows.c
  3. 3
      src/core/lib/iomgr/sockaddr_utils.c
  4. 3
      src/core/lib/iomgr/socket_utils.h
  5. 3
      src/core/lib/iomgr/socket_utils_common_posix.c
  6. 3
      src/core/lib/iomgr/socket_utils_windows.c
  7. 3
      src/core/lib/security/credentials/google_default/credentials_generic.c
  8. 8
      src/core/lib/security/credentials/google_default/google_default_credentials.h

@ -34,8 +34,8 @@
#ifndef GRPC_CORE_LIB_IOMGR_EV_EPOLL_LINUX_H
#define GRPC_CORE_LIB_IOMGR_EV_EPOLL_LINUX_H
#include "src/core/lib/iomgr/port.h"
#include "src/core/lib/iomgr/ev_posix.h"
#include "src/core/lib/iomgr/port.h"
const grpc_event_engine_vtable *grpc_init_epoll_linux(void);

@ -31,8 +31,8 @@
*
*/
#include "src/core/lib/iomgr/port.h"
#include <stdint.h>
#include "src/core/lib/iomgr/port.h"
#ifdef GRPC_WINSOCK_SOCKET

@ -157,8 +157,7 @@ int grpc_sockaddr_to_string(char **out, const struct sockaddr *addr,
port = ntohs(addr6->sin6_port);
}
if (ip != NULL &&
grpc_inet_ntop(addr->sa_family, ip, ntop_buf, sizeof(ntop_buf)) !=
NULL) {
grpc_inet_ntop(addr->sa_family, ip, ntop_buf, sizeof(ntop_buf)) != NULL) {
ret = gpr_join_host_port(out, ntop_buf, port);
} else {
ret = gpr_asprintf(out, "(sockaddr family=%d)", addr->sa_family);

@ -43,7 +43,6 @@
#endif
/* A wrapper for inet_ntop on POSIX systems and InetNtop on Windows systems */
const char *grpc_inet_ntop(int af, const void *src,
char *dst, socklen_t size);
const char *grpc_inet_ntop(int af, const void *src, char *dst, socklen_t size);
#endif /* GRPC_CORE_LIB_IOMGR_SOCKET_UTILS_H */

@ -297,8 +297,7 @@ grpc_error *grpc_create_dualstack_socket(const struct sockaddr *addr, int type,
return error_for_fd(*newfd, addr);
}
const char *grpc_inet_ntop(int af, const void *src,
char *dst, socklen_t size) {
const char *grpc_inet_ntop(int af, const void *src, char *dst, socklen_t size) {
return inet_ntop(af, src, dst, size);
}

@ -39,8 +39,7 @@
#include <grpc/support/log.h>
const char *grpc_inet_ntop(int af, const void *src,
char *dst, socklen_t size) {
const char *grpc_inet_ntop(int af, const void *src, char *dst, socklen_t size) {
GPR_ASSERT(sizeof(socklen_t) <= sizeof(size_t));
/* Windows InetNtopA wants a mutable ip pointer */
return InetNtopA(af, (void *)src, dst, (size_t)size);

@ -50,8 +50,7 @@ char *grpc_get_well_known_google_credentials_file_path_impl(void) {
" environment variable.");
return NULL;
}
gpr_asprintf(&result, "%s/%s", base,
GRPC_GOOGLE_CREDENTIALS_PATH_SUFFIX);
gpr_asprintf(&result, "%s/%s", base, GRPC_GOOGLE_CREDENTIALS_PATH_SUFFIX);
gpr_free(base);
return result;
}

@ -44,11 +44,15 @@
#ifdef GPR_WINDOWS
#define GRPC_GOOGLE_CREDENTIALS_PATH_ENV_VAR "APPDATA"
#define GRPC_GOOGLE_CREDENTIALS_PATH_SUFFIX GRPC_GOOGLE_CLOUD_SDK_CONFIG_DIRECTORY "/" GRPC_GOOGLE_WELL_KNOWN_CREDENTIALS_FILE
#define GRPC_GOOGLE_CREDENTIALS_PATH_SUFFIX \
GRPC_GOOGLE_CLOUD_SDK_CONFIG_DIRECTORY \
"/" GRPC_GOOGLE_WELL_KNOWN_CREDENTIALS_FILE
#define GRPC_GOOGLE_CREDENTIALS_GENERIC 1
#else
#define GRPC_GOOGLE_CREDENTIALS_PATH_ENV_VAR "HOME"
#define GRPC_GOOGLE_CREDENTIALS_PATH_SUFFIX ".config/" GRPC_GOOGLE_CLOUD_SDK_CONFIG_DIRECTORY "/" GRPC_GOOGLE_WELL_KNOWN_CREDENTIALS_FILE
#define GRPC_GOOGLE_CREDENTIALS_PATH_SUFFIX \
".config/" GRPC_GOOGLE_CLOUD_SDK_CONFIG_DIRECTORY \
"/" GRPC_GOOGLE_WELL_KNOWN_CREDENTIALS_FILE
#define GRPC_GOOGLE_CREDENTIALS_GENERIC 1
#endif

Loading…
Cancel
Save