diff options
| author | Joshua Haberman <joshua@reverberate.org> | 2010-07-11 18:53:27 -0700 |
|---|---|---|
| committer | Joshua Haberman <joshua@reverberate.org> | 2010-07-11 18:53:27 -0700 |
| commit | 7a6a702792e769366a8852fc90dbea9cfc9e01c0 (patch) | |
| tree | 3315b7ffaf527f1096aba986a73d346be00a68a1 /descriptor | |
| parent | fcfc37e7d41f87bc9ff5ecfb64e0aebb3457c633 (diff) | |
Allow static upb_strings.
This can allow strings to reference static data, and
reduced the memory footprint of test_def by about 10%
(3k).
Diffstat (limited to 'descriptor')
| -rw-r--r-- | descriptor/descriptor.c | 7 | ||||
| -rw-r--r-- | descriptor/descriptor.h | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/descriptor/descriptor.c b/descriptor/descriptor.c index cd50a16..ee6b25b 100644 --- a/descriptor/descriptor.c +++ b/descriptor/descriptor.c @@ -1,4 +1,6 @@ -unsigned char descriptor_pb[] = { +#include "descriptor.h" + +static unsigned char descriptor_pb[] = { 0x0a, 0x9b, 0x1b, 0x0a, 0x1b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0f, 0x67, 0x6f, @@ -291,4 +293,5 @@ unsigned char descriptor_pb[] = { 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x48, 0x01 }; -unsigned int descriptor_pb_len = 3486; +static const unsigned int descriptor_pb_len = 3486; +upb_string descriptor_str = UPB_STATIC_STRING(descriptor_pb); diff --git a/descriptor/descriptor.h b/descriptor/descriptor.h index b598a9a..f6d3ca3 100644 --- a/descriptor/descriptor.h +++ b/descriptor/descriptor.h @@ -11,12 +11,13 @@ #ifndef UPB_DESCRIPTOR_H_ #define UPB_DESCRIPTOR_H_ +#include "upb_string.h" + #ifdef __cplusplus extern "C" { #endif -extern unsigned char descriptor_pb[]; -extern unsigned int descriptor_pb_len; +extern upb_string descriptor_str; #ifdef __cplusplus } /* extern "C" */ |