Commit 61140407 authored by Peter Eisentraut's avatar Peter Eisentraut

Small code simplifications

strVal() can be used in a couple of places instead of coding the same
thing by hand.
parent 25a9e54d
...@@ -544,7 +544,7 @@ deflist_to_tuplestore(ReturnSetInfo *rsinfo, List *options) ...@@ -544,7 +544,7 @@ deflist_to_tuplestore(ReturnSetInfo *rsinfo, List *options)
nulls[0] = false; nulls[0] = false;
if (def->arg) if (def->arg)
{ {
values[1] = CStringGetTextDatum(((Value *) (def->arg))->val.str); values[1] = CStringGetTextDatum(strVal(def->arg));
nulls[1] = false; nulls[1] = false;
} }
else else
......
...@@ -13890,7 +13890,7 @@ func_expr_common_subexpr: ...@@ -13890,7 +13890,7 @@ func_expr_common_subexpr:
* Convert SystemTypeName() to SystemFuncName() even though * Convert SystemTypeName() to SystemFuncName() even though
* at the moment they result in the same thing. * at the moment they result in the same thing.
*/ */
$$ = (Node *) makeFuncCall(SystemFuncName(((Value *) llast($5->names))->val.str), $$ = (Node *) makeFuncCall(SystemFuncName(strVal(llast($5->names))),
list_make1($3), list_make1($3),
COERCE_EXPLICIT_CALL, COERCE_EXPLICIT_CALL,
@1); @1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment