Skip to content
Snippets Groups Projects
Commit 3d13d7e1 authored by Craig Tiller's avatar Craig Tiller
Browse files

Update copyright, choose a better sort order for our enum

parent dad1ea28
No related branches found
No related tags found
No related merge requests found
/* /*
* Copyright 2015, Google Inc. * Copyright 2017, Google Inc.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
/* /*
* Copyright 2015, Google Inc. * Copyright 2017, Google Inc.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
...@@ -40,13 +40,13 @@ ...@@ -40,13 +40,13 @@
#include <stdint.h> #include <stdint.h>
typedef enum { typedef enum {
GRPC_CHTTP2_SETTINGS_ENABLE_PUSH = 1, /* wire id 2 */
GRPC_CHTTP2_SETTINGS_GRPC_ALLOW_TRUE_BINARY_METADATA = 6, /* wire id 65027 */
GRPC_CHTTP2_SETTINGS_HEADER_TABLE_SIZE = 0, /* wire id 1 */ GRPC_CHTTP2_SETTINGS_HEADER_TABLE_SIZE = 0, /* wire id 1 */
GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE = 3, /* wire id 4 */ GRPC_CHTTP2_SETTINGS_ENABLE_PUSH = 1, /* wire id 2 */
GRPC_CHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS = 2, /* wire id 3 */ GRPC_CHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS = 2, /* wire id 3 */
GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE = 3, /* wire id 4 */
GRPC_CHTTP2_SETTINGS_MAX_FRAME_SIZE = 4, /* wire id 5 */ GRPC_CHTTP2_SETTINGS_MAX_FRAME_SIZE = 4, /* wire id 5 */
GRPC_CHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE = 5, /* wire id 6 */ GRPC_CHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE = 5, /* wire id 6 */
GRPC_CHTTP2_SETTINGS_GRPC_ALLOW_TRUE_BINARY_METADATA = 6, /* wire id 65027 */
} grpc_chttp2_setting_id; } grpc_chttp2_setting_id;
#define GRPC_CHTTP2_NUM_SETTINGS 7 #define GRPC_CHTTP2_NUM_SETTINGS 7
......
#!/usr/bin/env python2.7 #!/usr/bin/env python2.7
# Copyright 2015, Google Inc. # Copyright 2017, Google Inc.
# All rights reserved. # All rights reserved.
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
...@@ -106,10 +106,9 @@ decorated_settings = [DecoratedSetting(hash(setting.id), name, setting) ...@@ -106,10 +106,9 @@ decorated_settings = [DecoratedSetting(hash(setting.id), name, setting)
for name, setting in _SETTINGS.iteritems()] for name, setting in _SETTINGS.iteritems()]
print >>H, 'typedef enum {' print >>H, 'typedef enum {'
for name in sorted(_SETTINGS.keys()): for decorated_setting in sorted(decorated_settings):
setting = _SETTINGS[name]
print >>H, ' GRPC_CHTTP2_SETTINGS_%s = %d, /* wire id %d */' % ( print >>H, ' GRPC_CHTTP2_SETTINGS_%s = %d, /* wire id %d */' % (
name, hash(setting.id), setting.id) decorated_setting.name, decorated_setting.enum, decorated_setting.setting.id)
print >>H, '} grpc_chttp2_setting_id;' print >>H, '} grpc_chttp2_setting_id;'
print >>H print >>H
print >>H, '#define GRPC_CHTTP2_NUM_SETTINGS %d' % (max(x.enum for x in decorated_settings) + 1) print >>H, '#define GRPC_CHTTP2_NUM_SETTINGS %d' % (max(x.enum for x in decorated_settings) + 1)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment