Deleted some dead code related to varint decoding.

1 files changed, 0 insertions, 157 deletions

diff --git a/tests/pb/test_varint.c b/tests/pb/test_varint.c
index eff03fa..f77eebd 100644
--- a/tests/pb/test_varint.c
+++ b/tests/pb/test_varint.c
@@ -86,168 +86,11 @@ static void test_varint_decoder(upb_decoderet (*decoder)(const char*)) {
 
 TEST_VARINT_DECODER(check2_branch32)
 TEST_VARINT_DECODER(check2_branch64)
-TEST_VARINT_DECODER(check2_wright)
-TEST_VARINT_DECODER(check2_massimino)
 
 int run_tests(int argc, char *argv[]) {
   UPB_UNUSED(argc);
   UPB_UNUSED(argv);
   test_check2_branch32();
   test_check2_branch64();
-  test_check2_wright();
-  test_check2_massimino();
   return 0;
 }
-
-#if 0
-static void test_get_v_uint32_t()
-{
-#define TEST(name, bytes, val) {\
-    upb_status status = UPB_STATUS_INIT; \
-    const uint8_t name[] = bytes; \
-    const uint8_t *name ## _buf = name; \
-    uint32_t name ## _val = 0; \
-    name ## _buf = upb_get_v_uint32_t(name, name + sizeof(name), &name ## _val, &status); \
-    ASSERT(upb_ok(&status)); \
-    ASSERT(name ## _val == val); \
-    ASSERT(name ## _buf == name + sizeof(name) - 1);  /* - 1 for NULL */ \
-    /* Test NEED_MORE_DATA. */ \
-    if(sizeof(name) > 2) { \
-      name ## _buf = upb_get_v_uint32_t(name, name + sizeof(name) - 2, &name ## _val, &status); \
-      ASSERT(status.code == UPB_STATUS_NEED_MORE_DATA); \
-    } \
-  }
-
-  TEST(zero,   "\x00",                                              0UL);
-  TEST(one,    "\x01",                                              1UL);
-  TEST(twob,   "\x81\x03",                                      0x181UL);
-  TEST(threeb, "\x81\x83\x07",                                0x1c181UL);
-  TEST(fourb,  "\x81\x83\x87\x0f",                          0x1e1c181UL);
-  /* get_v_uint32_t truncates, so all the rest return the same thing. */
-  TEST(fiveb,  "\x81\x83\x87\x8f\x1f",                     0xf1e1c181UL);
-  TEST(sixb,   "\x81\x83\x87\x8f\x9f\x3f",                 0xf1e1c181UL);
-  TEST(sevenb, "\x81\x83\x87\x8f\x9f\xbf\x7f",             0xf1e1c181UL);
-  TEST(eightb, "\x81\x83\x87\x8f\x9f\xbf\xff\x01",         0xf1e1c181UL);
-  TEST(nineb,  "\x81\x83\x87\x8f\x9f\xbf\xff\x81\x03",     0xf1e1c181UL);
-  TEST(tenb,   "\x81\x83\x87\x8f\x9f\xbf\xff\x81\x83\x07", 0xf1e1c181UL);
-#undef TEST
-
-  uint8_t twelvebyte[] = {0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x01, 0x01};
-  uint32_t twelvebyte_val = 0;
-  upb_status status = UPB_STATUS_INIT;
-  /* A varint that terminates before hitting the end of the provided buffer,
-   * but in too many bytes (11 instead of 10). */
-  upb_get_v_uint32_t(twelvebyte, twelvebyte + 12, &twelvebyte_val, &status);
-  ASSERT(status.code == UPB_ERROR_UNTERMINATED_VARINT);
-
-  /* A varint that terminates simultaneously with the end of the provided
-   * buffer, but in too many bytes (11 instead of 10). */
-  upb_reset(&status);
-  upb_get_v_uint32_t(twelvebyte, twelvebyte + 11, &twelvebyte_val, &status);
-  ASSERT(status.code == UPB_ERROR_UNTERMINATED_VARINT);
-
-  /* A varint whose buffer ends on exactly the byte where the varint must
-   * terminate, but the final byte does not terminate.  The absolutely most
-   * correct return code here is UPB_ERROR_UNTERMINATED_VARINT, because we know
-   * by this point that the varint does not properly terminate.  But we also
-   * allow a return value of UPB_STATUS_NEED_MORE_DATA here, because it does not
-   * compromise overall correctness -- clients who supply more data later will
-   * then receive a UPB_ERROR_UNTERMINATED_VARINT error; clients who have no
-   * more data to supply will (rightly) conclude that their protobuf is corrupt.
-   */
-  upb_reset(&status);
-  upb_get_v_uint32_t(twelvebyte, twelvebyte + 10, &twelvebyte_val, &status);
-  ASSERT(status.code == UPB_ERROR_UNTERMINATED_VARINT ||
-         status.code == UPB_STATUS_NEED_MORE_DATA);
-
-  upb_reset(&status);
-  upb_get_v_uint32_t(twelvebyte, twelvebyte + 9, &twelvebyte_val, &status);
-  ASSERT(status.code == UPB_STATUS_NEED_MORE_DATA);
-}
-
-static void test_skip_v_uint64_t()
-{
-#define TEST(name, bytes) {\
-    upb_status status = UPB_STATUS_INIT; \
-    const uint8_t name[] = bytes; \
-    const uint8_t *name ## _buf = name; \
-    name ## _buf = upb_skip_v_uint64_t(name ## _buf, name + sizeof(name), &status); \
-    ASSERT(upb_ok(&status)); \
-    ASSERT(name ## _buf == name + sizeof(name) - 1);  /* - 1 for NULL */ \
-    /* Test NEED_MORE_DATA. */ \
-    if(sizeof(name) > 2) { \
-      name ## _buf = upb_skip_v_uint64_t(name, name + sizeof(name) - 2, &status); \
-      ASSERT(status.code == UPB_STATUS_NEED_MORE_DATA); \
-    } \
-  }
-
-  TEST(zero,   "\x00");
-  TEST(one,    "\x01");
-  TEST(twob,   "\x81\x03");
-  TEST(threeb, "\x81\x83\x07");
-  TEST(fourb,  "\x81\x83\x87\x0f");
-  TEST(fiveb,  "\x81\x83\x87\x8f\x1f");
-  TEST(sixb,   "\x81\x83\x87\x8f\x9f\x3f");
-  TEST(sevenb, "\x81\x83\x87\x8f\x9f\xbf\x7f");
-  TEST(eightb, "\x81\x83\x87\x8f\x9f\xbf\xff\x01");
-  TEST(nineb,  "\x81\x83\x87\x8f\x9f\xbf\xff\x81\x03");
-  TEST(tenb,   "\x81\x83\x87\x8f\x9f\xbf\xff\x81\x83\x07");
-#undef TEST
-
-  uint8_t twelvebyte[] = {0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x01, 0x01};
-  upb_status status = UPB_STATUS_INIT;
-  /* A varint that terminates before hitting the end of the provided buffer,
-   * but in too many bytes (11 instead of 10). */
-  upb_skip_v_uint64_t(twelvebyte, twelvebyte + 12, &status);
-  ASSERT(status.code == UPB_ERROR_UNTERMINATED_VARINT);
-
-  /* A varint that terminates simultaneously with the end of the provided
-   * buffer, but in too many bytes (11 instead of 10). */
-  upb_reset(&status);
-  upb_skip_v_uint64_t(twelvebyte, twelvebyte + 11, &status);
-  ASSERT(status.code == UPB_ERROR_UNTERMINATED_VARINT);
-
-  /* A varint whose buffer ends on exactly the byte where the varint must
-   * terminate, but the final byte does not terminate.  The absolutely most
-   * correct return code here is UPB_ERROR_UNTERMINATED_VARINT, because we know
-   * by this point that the varint does not properly terminate.  But we also
-   * allow a return value of UPB_STATUS_NEED_MORE_DATA here, because it does not
-   * compromise overall correctness -- clients who supply more data later will
-   * then receive a UPB_ERROR_UNTERMINATED_VARINT error; clients who have no
-   * more data to supply will (rightly) conclude that their protobuf is corrupt.
-   */
-  upb_reset(&status);
-  upb_skip_v_uint64_t(twelvebyte, twelvebyte + 10, &status);
-  ASSERT(status.code == UPB_ERROR_UNTERMINATED_VARINT ||
-         status.code == UPB_STATUS_NEED_MORE_DATA);
-
-  upb_reset(&status);
-  upb_skip_v_uint64_t(twelvebyte, twelvebyte + 9, &status);
-  ASSERT(status.code == UPB_STATUS_NEED_MORE_DATA);
-}
-
-static void test_get_f_uint32_t()
-{
-#define TEST(name, bytes, val) {\
-    upb_status status = UPB_STATUS_INIT; \
-    const uint8_t name[] = bytes; \
-    const uint8_t *name ## _buf = name; \
-    uint32_t name ## _val = 0; \
-    name ## _buf = upb_get_f_uint32_t(name ## _buf, name + sizeof(name), &name ## _val, &status); \
-    ASSERT(upb_ok(&status)); \
-    ASSERT(name ## _val == val); \
-    ASSERT(name ## _buf == name + sizeof(name) - 1);  /* - 1 for NULL */ \
-  }
-
-  TEST(zero,  "\x00\x00\x00\x00",                                0x0UL);
-  TEST(one,   "\x01\x00\x00\x00",                                0x1UL);
-
-  uint8_t threeb[] = {0x00, 0x00, 0x00};
-  uint32_t threeb_val;
-  upb_status status = UPB_STATUS_INIT;
-  upb_get_f_uint32_t(threeb, threeb + sizeof(threeb), &threeb_val, &status);
-  ASSERT(status.code == UPB_STATUS_NEED_MORE_DATA);
-
-#undef TEST
-}
-#endif