Major refactoring: upb_string is gone in favor of upb_strref.

1 files changed, 14 insertions, 11 deletions

diff --git a/tests/test_decoder.c b/tests/test_decoder.c
index 7b168de..1c3bed0 100644
--- a/tests/test_decoder.c
+++ b/tests/test_decoder.c
@@ -1,4 +1,5 @@
 
+#include <stdlib.h>
 #include "upb_decoder.h"
 #include "upb_textprinter.h"
 #include "upb_stdio.h"
@@ -11,20 +12,21 @@ int main(int argc, char *argv[]) {
   }
 
   upb_symtab *symtab = upb_symtab_new();
-  upb_string *desc = upb_strreadfile(argv[1]);
+  size_t desc_len;
+  const char *desc = upb_readfile(argv[1], &desc_len);
   if (!desc) {
     fprintf(stderr, "Couldn't open descriptor file: %s\n", argv[1]);
     return 1;
   }
 
   upb_status status = UPB_STATUS_INIT;
-  upb_read_descriptor(symtab, desc, &status);
+  upb_read_descriptor(symtab, desc, desc_len, &status);
   if (!upb_ok(&status)) {
     fprintf(stderr, "Error parsing descriptor: ");
     upb_printerr(&status);
     return 1;
   }
-  upb_string_unref(desc);
+  free((void*)desc);
 
   upb_string *name = upb_strdupc(argv[2]);
   upb_def *md = upb_symtab_lookup(symtab, name);
@@ -40,19 +42,20 @@ int main(int argc, char *argv[]) {
     return 1;
   }
 
-  upb_stdio *in = upb_stdio_new();
-  upb_stdio_reset(in, stdin);
-  upb_stdio *out = upb_stdio_new();
-  upb_stdio_reset(out, stdout);
+  upb_stdio in, out;
+  upb_stdio_init(&in);
+  upb_stdio_init(&out);
+  upb_stdio_reset(&in, stdin);
+  upb_stdio_reset(&out, stdout);
 
   upb_handlers *handlers = upb_handlers_new();
   upb_textprinter *p = upb_textprinter_new();
-  upb_textprinter_reset(p, upb_stdio_bytesink(out), false);
+  upb_textprinter_reset(p, upb_stdio_bytesink(&out), false);
   upb_textprinter_reghandlers(handlers, m);
 
   upb_decoder d;
   upb_decoder_initforhandlers(&d, handlers);
-  upb_decoder_reset(&d, upb_stdio_bytesrc(in), p);
+  upb_decoder_reset(&d, upb_stdio_bytesrc(&in), 0, UINT64_MAX, p);
 
   upb_clearerr(&status);
   upb_decoder_decode(&d, &status);
@@ -63,8 +66,8 @@ int main(int argc, char *argv[]) {
   }
 
   upb_status_uninit(&status);
-  upb_stdio_free(in);
-  upb_stdio_free(out);
+  upb_stdio_uninit(&in);
+  upb_stdio_uninit(&out);
   upb_decoder_uninit(&d);
   upb_textprinter_free(p);
   upb_def_unref(UPB_UPCAST(m));