NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit220db7c

committed

Simplify and standardize conversions between TEXT datums and ordinary C

strings. This patch introduces four support functions cstring_to_text,cstring_to_text_with_len, text_to_cstring, and text_to_cstring_buffer, andtwo macros CStringGetTextDatum and TextDatumGetCString. A number ofexisting macros that provided variants on these themes were removed.Most of the places that need to make such conversions now require just onefunction or macro call, in place of the multiple notational layers that usedto be needed. There are no longer any direct calls of textout or textin,and we got most of the places that were using handmade conversions viamemcpy (there may be a few still lurking, though).This commit doesn't make any serious effort to eliminate transient memoryleaks caused by detoasting toasted text objects before they reachtext_to_cstring. We changed PG_GETARG_TEXT_P to PG_GETARG_TEXT_PP in a fewplaces where it was easy, but much more could be done.Brendan Jurd and Tom Lane

1 parentf948197 commit220db7cCopy full SHA for 220db7c

File tree

94 files changed

+770

-1210

lines changed

contrib
- adminpack
  - adminpack.c
- chkpass
  - chkpass.c
- dblink
  - dblink.c
- fuzzystrmatch
- hstore
  - hstore_op.c
- intarray
  - _int_bool.c
- ltree
  - ltree_op.c
- pageinspect
  - heapfuncs.c
  - rawpage.c
- pgcrypto
  - pgcrypto.c
- spi
- sslinfo
  - sslinfo.c
- tablefunc
  - tablefunc.c
- tsearch2
  - tsearch2.c
- uuid-ossp
  - uuid-ossp.c
- xml2
  - xpath.c
  - xslt_proc.c
doc/src/sgml
- spi.sgml
src
- backend
  - access
    - common
      - reloptions.c
    - transam
      - twophase.c
      - xlog.c
  - catalog
  - commands
  - executor
  - libpq
    - be-fsstubs.c
  - optimizer
    - path
      - indxpath.c
    - util
      - clauses.c
  - parser
    - parse_utilcmd.c
  - rewrite
    - rewriteDefine.c
  - tsearch
    - dict.c
    - to_tsany.c
  - utils
    - adt
    - cache
      - lsyscache.c
      - relcache.c
    - fmgr
      - fmgr.c
      - funcapi.c
    - init
      - flatfiles.c
    - misc
      - guc.c
    - mmgr
      - portalmem.c
- include
  - tsearch
    - ts_utils.h
  - utils
    - builtins.h
- pl
  - plperl
    - plperl.c
  - plpgsql/src
    - pl_comp.c
    - pl_exec.c
  - plpython
    - plpython.c
  - tcl
    - pltcl.c
- test/regress
  - regress.c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+770

-1210

lines changed

`‎contrib/adminpack/adminpack.c`

Lines changed: 3 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`* Author: Andreas Pflug <pgadmin@pse-consulting.de>`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/contrib/adminpack/adminpack.c,v 1.10 2008/01/01 19:45:45 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/contrib/adminpack/adminpack.c,v 1.11 2008/03/25 22:42:41 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -23,6 +23,7 @@`
`23`	`23`	`#include"miscadmin.h"`
`24`	`24`	`#include"postmaster/syslogger.h"`
`25`	`25`	`#include"storage/fd.h"`
	`26`	`+#include"utils/builtins.h"`
`26`	`27`	`#include"utils/datetime.h"`
`27`	`28`
`28`	`29`
`@@ -68,11 +69,7 @@ typedef struct`
`68`	`69`	`staticchar*`
`69`	`70`	`convert_and_check_filename(text*arg,boollogAllowed)`
`70`	`71`	`{`
`71`		`-intinput_len=VARSIZE(arg)-VARHDRSZ;`
`72`		`-char*filename=palloc(input_len+1);`
`73`		`-`
`74`		`-memcpy(filename,VARDATA(arg),input_len);`
`75`		`-filename[input_len]='\0';`
	`72`	`+char*filename=text_to_cstring(arg);`
`76`	`73`
`77`	`74`	`canonicalize_path(filename);/* filename can change length here */`
`78`	`75`

`‎contrib/chkpass/chkpass.c`

Lines changed: 9 additions & 21 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`* darcy@druid.net`
`5`	`5`	`* http://www.druid.net/darcy/`
`6`	`6`	`*`
`7`		`- * $PostgreSQL: pgsql/contrib/chkpass/chkpass.c,v 1.19 2007/02/27 23:48:05 tgl Exp $`
	`7`	`+ * $PostgreSQL: pgsql/contrib/chkpass/chkpass.c,v 1.20 2008/03/25 22:42:41 tgl Exp $`
`8`	`8`	`* best viewed with tabs set to 4`
`9`	`9`	`*/`
`10`	`10`
`@@ -17,6 +17,7 @@`
`17`	`17`	`#endif`
`18`	`18`
`19`	`19`	`#include"fmgr.h"`
	`20`	`+#include"utils/builtins.h"`
`20`	`21`
`21`	`22`	`PG_MODULE_MAGIC;`
`22`	`23`
`@@ -124,15 +125,8 @@ Datum`
`124`	`125`	`chkpass_rout(PG_FUNCTION_ARGS)`
`125`	`126`	`{`
`126`	`127`	`chkpasspassword= (chkpass)PG_GETARG_POINTER(0);`
`127`		`-text*result;`
`128`		`-intslen;`
`129`	`128`
`130`		`-slen=strlen(password->password);`
`131`		`-result= (text*)palloc(VARHDRSZ+slen);`
`132`		`-SET_VARSIZE(result,VARHDRSZ+slen);`
`133`		`-memcpy(VARDATA(result),password->password,slen);`
`134`		`-`
`135`		`-PG_RETURN_TEXT_P(result);`
	`129`	`+PG_RETURN_TEXT_P(cstring_to_text(password->password));`
`136`	`130`	`}`
`137`	`131`
`138`	`132`
`@@ -145,13 +139,10 @@ Datum`
`145`	`139`	`chkpass_eq(PG_FUNCTION_ARGS)`
`146`	`140`	`{`
`147`	`141`	`chkpassa1= (chkpass)PG_GETARG_POINTER(0);`
`148`		`-texta2= (text)PG_GETARG_TEXT_P(1);`
`149`		`-charstr[10];`
`150`		`-intsz;`
	`142`	`+text*a2=PG_GETARG_TEXT_PP(1);`
	`143`	`+charstr[9];`
`151`	`144`
`152`		`-sz=Min(VARSIZE(a2)-VARHDRSZ,8);`
`153`		`-memcpy(str,VARDATA(a2),sz);`
`154`		`-str[sz]='\0';`
	`145`	`+text_to_cstring_buffer(a2,str,sizeof(str));`
`155`	`146`	`PG_RETURN_BOOL(strcmp(a1->password,crypt(str,a1->password))==0);`
`156`	`147`	`}`
`157`	`148`
`@@ -160,12 +151,9 @@ Datum`
`160`	`151`	`chkpass_ne(PG_FUNCTION_ARGS)`
`161`	`152`	`{`
`162`	`153`	`chkpassa1= (chkpass)PG_GETARG_POINTER(0);`
`163`		`-texta2= (text)PG_GETARG_TEXT_P(1);`
`164`		`-charstr[10];`
`165`		`-intsz;`
	`154`	`+text*a2=PG_GETARG_TEXT_PP(1);`
	`155`	`+charstr[9];`
`166`	`156`
`167`		`-sz=Min(VARSIZE(a2)-VARHDRSZ,8);`
`168`		`-memcpy(str,VARDATA(a2),sz);`
`169`		`-str[sz]='\0';`
	`157`	`+text_to_cstring_buffer(a2,str,sizeof(str));`
`170`	`158`	`PG_RETURN_BOOL(strcmp(a1->password,crypt(str,a1->password))!=0);`
`171`	`159`	`}`

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!

Commit220db7c

File tree

94 files changed

Some content is hidden

94 files changed

`‎contrib/adminpack/adminpack.c`

`‎contrib/chkpass/chkpass.c`

0 commit comments