NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit0db7c67

committed

Minor code beautification in regexp.c.

Remove duplicated code (apparently introduced by commitc8ea87e).Also get rid of some PG_USED_FOR_ASSERTS_ONLY variables we don'treally need to have.Li Japin, Tom LaneDiscussion:https://postgr.es/m/PS1PR0601MB3770A5595B6E5E3FD6F35724B6360@PS1PR0601MB3770.apcprd06.prod.outlook.com

1 parent1281a5c commit0db7c67Copy full SHA for 0db7c67

File tree

1 file changed

-11

lines changed

src/backend/utils/adt
- regexp.c

1 file changed

-11

lines changed

`‎src/backend/utils/adt/regexp.c`

Lines changed: 7 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ typedef struct regexp_matches_ctx`
`63`	`63`	`Datumelems;/ has npatterns elements */`
`64`	`64`	`boolnulls;/ has npatterns elements */`
`65`	`65`	`pg_wcharwide_str;/ wide-char version of original string */`
`66`		`-charconv_buf;/ conversion buffer */`
	`66`	`+charconv_buf;/ conversion buffer, if needed */`
`67`	`67`	`intconv_bufsiz;/* size thereof */`
`68`	`68`	`}regexp_matches_ctx;`
`69`	`69`
`@@ -1285,7 +1285,6 @@ static ArrayType *`
`1285`	`1285`	`build_regexp_match_result(regexp_matches_ctx*matchctx)`
`1286`	`1286`	`{`
`1287`	`1287`	`char*buf=matchctx->conv_buf;`
`1288`		`-intbufsizPG_USED_FOR_ASSERTS_ONLY=matchctx->conv_bufsiz;`
`1289`	`1288`	`Datum*elems=matchctx->elems;`
`1290`	`1289`	`bool*nulls=matchctx->nulls;`
`1291`	`1290`	`intdims[1];`
`@@ -1311,7 +1310,7 @@ build_regexp_match_result(regexp_matches_ctx *matchctx)`
`1311`	`1310`	`buf,`
`1312`	`1311`	`eo-so);`
`1313`	`1312`
`1314`		`-Assert(len<bufsiz);`
	`1313`	`+Assert(len<matchctx->conv_bufsiz);`
`1315`	`1314`	`elems[i]=PointerGetDatum(cstring_to_text_with_len(buf,len));`
`1316`	`1315`	`nulls[i]= false;`
`1317`	`1316`	`}`
`@@ -1467,25 +1466,22 @@ build_regexp_split_result(regexp_matches_ctx *splitctx)`
`1467`	`1466`	`if (startpos<0)`
`1468`	`1467`	`elog(ERROR,"invalid match ending position");`
`1469`	`1468`
	`1469`	`+endpos=splitctx->match_locs[splitctx->next_match*2];`
	`1470`	`+if (endpos<startpos)`
	`1471`	`+elog(ERROR,"invalid match starting position");`
	`1472`	`+`
`1470`	`1473`	`if (buf)`
`1471`	`1474`	`{`
`1472`		`-intbufsizPG_USED_FOR_ASSERTS_ONLY=splitctx->conv_bufsiz;`
`1473`	`1475`	`intlen;`
`1474`	`1476`
`1475`		`-endpos=splitctx->match_locs[splitctx->next_match*2];`
`1476`		`-if (endpos<startpos)`
`1477`		`-elog(ERROR,"invalid match starting position");`
`1478`	`1477`	`len=pg_wchar2mb_with_len(splitctx->wide_str+startpos,`
`1479`	`1478`	`buf,`
`1480`	`1479`	`endpos-startpos);`
`1481`		`-Assert(len<bufsiz);`
	`1480`	`+Assert(len<splitctx->conv_bufsiz);`
`1482`	`1481`	`returnPointerGetDatum(cstring_to_text_with_len(buf,len));`
`1483`	`1482`	`}`
`1484`	`1483`	`else`
`1485`	`1484`	`{`
`1486`		`-endpos=splitctx->match_locs[splitctx->next_match*2];`
`1487`		`-if (endpos<startpos)`
`1488`		`-elog(ERROR,"invalid match starting position");`
`1489`	`1485`	`returnDirectFunctionCall3(text_substr,`
`1490`	`1486`	`PointerGetDatum(splitctx->orig_str),`
`1491`	`1487`	`Int32GetDatum(startpos+1),`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit0db7c67

File tree

1 file changed

1 file changed

`‎src/backend/utils/adt/regexp.c`

0 commit comments