diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-01-28 11:48:18 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-01-28 11:48:18 -0800 |
| commit | 2d50f37047561bdabed6ddda68baa14e691a26ea (patch) | |
| tree | 36a0b93906f00d5dbe5d75b5739c31dcea1af227 | |
| parent | 8c50db09b9fc937a16ace5b0783980b4a8ffc0ec (diff) | |
Fix copyrights, formatting
| -rw-r--r-- | include/grpc/support/avl.h | 4 | ||||
| -rw-r--r-- | src/core/client_config/subchannel_index.h | 2 | ||||
| -rw-r--r-- | src/core/support/avl.c | 2 | ||||
| -rwxr-xr-x | tools/distrib/check_copyright.py | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/include/grpc/support/avl.h b/include/grpc/support/avl.h index 54605ceb7c..23c3e466a6 100644 --- a/include/grpc/support/avl.h +++ b/include/grpc/support/avl.h @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -89,4 +89,4 @@ gpr_avl gpr_avl_remove(gpr_avl avl, void *key); returns NULL if key is not found. */ void *gpr_avl_get(gpr_avl avl, void *key); -#endif +#endif /* GRPC_SUPPORT_AVL_H */ diff --git a/src/core/client_config/subchannel_index.h b/src/core/client_config/subchannel_index.h index fc3187a758..095ef17819 100644 --- a/src/core/client_config/subchannel_index.h +++ b/src/core/client_config/subchannel_index.h @@ -56,7 +56,7 @@ void grpc_subchannel_key_destroy(grpc_exec_ctx *exec_ctx, grpc_subchannel *grpc_subchannel_index_find(grpc_exec_ctx *exec_ctx, grpc_subchannel_key *key); -/** Register a subchannel against a key. +/** Register a subchannel against a key. Takes ownership of \a constructed. Returns the registered subchannel. This may be different from \a constructed in the case of a registration race. */ diff --git a/src/core/support/avl.c b/src/core/support/avl.c index 8d3ce23e6c..f378b3ee17 100644 --- a/src/core/support/avl.c +++ b/src/core/support/avl.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/tools/distrib/check_copyright.py b/tools/distrib/check_copyright.py index 6123218c55..174781e6f6 100755 --- a/tools/distrib/check_copyright.py +++ b/tools/distrib/check_copyright.py @@ -68,9 +68,9 @@ with open('LICENSE') as f: # that given a line of license text, returns what should # be in the file LICENSE_PREFIX = { - '.c': r'\s*(//|\*)\s*', - '.cc': r'\s*(//|\*)\s*', - '.h': r'\s*(//|\*)\s*', + '.c': r'\s*(?://|\*)\s*', + '.cc': r'\s*(?://|\*)\s*', + '.h': r'\s*(?://|\*)\s*', '.m': r'\s*\*\s*', '.php': r'\s*\*\s*', '.js': r'\s*\*\s*', |