Remove more dead code

diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c
index ddb6e6929c5e1f0f6d679882b688be2c39b12c16..c735ebf94a4d9476f79ef1ff97b52321272c81d5 100644 (file)
--- a/src/backend/utils/adt/jsonb.c
+++ b/src/backend/utils/adt/jsonb.c
@@ -314,8 +314,7 @@ jsonb_in_scalar(void *state, char *token, JsonTokenType tokentype)
            v.type = jbvNull;
            break;
        default:
-           /* nothing else should be here in fact */
-           Assert(false);
+           elog(ERROR, "invalid json token type");
            break;
    }
 

diff --git a/src/backend/utils/adt/jsonb_support.c b/src/backend/utils/adt/jsonb_support.c
index a791369522760a45d10677b23705a4bea72221bc..add1375496c4fa6d5ce5a7b9ccd05685678b00f9 100644 (file)
--- a/src/backend/utils/adt/jsonb_support.c
+++ b/src/backend/utils/adt/jsonb_support.c
@@ -91,11 +91,7 @@ JsonbValueToJsonb(JsonbValue * v)
 {
    Jsonb      *out;
 
-   if (v == NULL)
-   {
-       out = NULL;
-   }
-   else if (v->type >= jbvNull && v->type < jbvArray)
+   if (v->type >= jbvNull && v->type < jbvArray)
    {
        /* Scalar value */
        ToJsonbState *state = NULL;