Merge with master

1 files changed, 21 insertions, 21 deletions

diff --git a/src/core/ext/filters/client_channel/resolver.h b/src/core/ext/filters/client_channel/resolver.h
index 4adf60d1b0..30b0afaf74 100644
--- a/src/core/ext/filters/client_channel/resolver.h
+++ b/src/core/ext/filters/client_channel/resolver.h
@@ -35,46 +35,46 @@ extern grpc_tracer_flag grpc_trace_resolver_refcount;
 
 /** \a grpc_resolver provides \a grpc_channel_args objects to its caller */
 struct grpc_resolver {
-  const grpc_resolver_vtable *vtable;
+  const grpc_resolver_vtable* vtable;
   gpr_refcount refs;
-  grpc_combiner *combiner;
+  grpc_combiner* combiner;
 };
 
 struct grpc_resolver_vtable {
-  void (*destroy)(grpc_resolver *resolver);
-  void (*shutdown_locked)(grpc_resolver *resolver);
-  void (*channel_saw_error_locked)(grpc_resolver *resolver);
-  void (*next_locked)(grpc_resolver *resolver, grpc_channel_args **result,
-                      grpc_closure *on_complete);
+  void (*destroy)(grpc_resolver* resolver);
+  void (*shutdown_locked)(grpc_resolver* resolver);
+  void (*channel_saw_error_locked)(grpc_resolver* resolver);
+  void (*next_locked)(grpc_resolver* resolver, grpc_channel_args** result,
+                      grpc_closure* on_complete);
 };
 
 #ifndef NDEBUG
 #define GRPC_RESOLVER_REF(p, r) grpc_resolver_ref((p), __FILE__, __LINE__, (r))
 #define GRPC_RESOLVER_UNREF(p, r) \
   grpc_resolver_unref((p), __FILE__, __LINE__, (r))
-void grpc_resolver_ref(grpc_resolver *policy, const char *file, int line,
-                       const char *reason);
-void grpc_resolver_unref(grpc_resolver *policy, const char *file, int line,
-                         const char *reason);
+void grpc_resolver_ref(grpc_resolver* policy, const char* file, int line,
+                       const char* reason);
+void grpc_resolver_unref(grpc_resolver* policy, const char* file, int line,
+                         const char* reason);
 #else
 #define GRPC_RESOLVER_REF(p, r) grpc_resolver_ref((p))
 #define GRPC_RESOLVER_UNREF(p, r) grpc_resolver_unref((p))
-void grpc_resolver_ref(grpc_resolver *policy);
-void grpc_resolver_unref(grpc_resolver *policy);
+void grpc_resolver_ref(grpc_resolver* policy);
+void grpc_resolver_unref(grpc_resolver* policy);
 #endif
 
-void grpc_resolver_init(grpc_resolver *resolver,
-                        const grpc_resolver_vtable *vtable,
-                        grpc_combiner *combiner);
+void grpc_resolver_init(grpc_resolver* resolver,
+                        const grpc_resolver_vtable* vtable,
+                        grpc_combiner* combiner);
 
-void grpc_resolver_shutdown_locked(grpc_resolver *resolver);
+void grpc_resolver_shutdown_locked(grpc_resolver* resolver);
 
 /** Notification that the channel has seen an error on some address.
     Can be used as a hint that re-resolution is desirable soon.
 
     Must be called from the combiner passed as a resolver_arg at construction
     time.*/
-void grpc_resolver_channel_saw_error_locked(grpc_resolver *resolver);
+void grpc_resolver_channel_saw_error_locked(grpc_resolver* resolver);
 
 /** Get the next result from the resolver.  Expected to set \a *result with
     new channel args and then schedule \a on_complete for execution.
@@ -84,9 +84,9 @@ void grpc_resolver_channel_saw_error_locked(grpc_resolver *resolver);
 
     Must be called from the combiner passed as a resolver_arg at construction
     time.*/
-void grpc_resolver_next_locked(grpc_resolver *resolver,
-                               grpc_channel_args **result,
-                               grpc_closure *on_complete);
+void grpc_resolver_next_locked(grpc_resolver* resolver,
+                               grpc_channel_args** result,
+                               grpc_closure* on_complete);
 
 #ifdef __cplusplus
 }