summaryrefslogtreecommitdiff
path: root/src/upb_def.h
diff options
context:
space:
mode:
authorJoshua Haberman <joshua@reverberate.org>2010-06-14 10:47:56 -0700
committerJoshua Haberman <joshua@reverberate.org>2010-06-14 10:47:56 -0700
commit35e5c248bee19703b7e3c9e43d7bd8fd7aa2a79d (patch)
tree05807171c7d4bdb42b85abf0e0e91baef2392d87 /src/upb_def.h
parent00b403a7373d783744bebdffde3696824d68b745 (diff)
Work to make upb_def consume a upb_src.
Diffstat (limited to 'src/upb_def.h')
-rw-r--r--src/upb_def.h15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/upb_def.h b/src/upb_def.h
index a571730..0b8f114 100644
--- a/src/upb_def.h
+++ b/src/upb_def.h
@@ -244,12 +244,15 @@ upb_def *upb_symtab_lookup(upb_symtab *s, upb_string *sym);
// returned, otherwise only defs of the required type are returned.
upb_def **upb_symtab_getdefs(upb_symtab *s, int *count, upb_def_type_t type);
-// Adds the definitions in the given serialized descriptor to this symtab. All
-// types that are referenced from desc must have previously been defined (or be
-// defined in desc). desc may not attempt to define any names that are already
-// defined in this symtab. Caller retains ownership of desc. status indicates
-// whether the operation was successful or not, and the error message (if any).
-void upb_symtab_add_desc(upb_symtab *s, upb_string *desc, upb_status *status);
+// "fds" is a upb_src that will yield data from the
+// google.protobuf.FileDescriptorSet message type. upb_symtab_add_fds() adds
+// all the definitions from the given FileDescriptorSet and adds them to the
+// symtab. status indicates whether the operation was successful or not, and
+// the error message (if any).
+//
+// TODO: should this allow redefinition? Either is possible, but which is
+// more useful? Maybe it should be an option.
+void upb_symtab_addfds(upb_symtab *s, upb_src *desc, upb_status *status);
/* upb_def casts **************************************************************/
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback