NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit05ace73

committed

Change the float4-returning functions in contrib/seg to fmgr v1 calling

conventions.I also changed seg_in and seg_out, which was probably unnecessary, butit can't harm.

1 parent41de1d1 commit05ace73Copy full SHA for 05ace73

File tree

1 file changed

+34

-23

lines changed

contrib/seg
- seg.c

1 file changed

+34

-23

lines changed

`‎contrib/seg/seg.c`

Lines changed: 34 additions & 23 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,11 +33,17 @@ extern int seg_yydebug;`
`33`	`33`	`/*`
`34`	`34`	`** Input/Output routines`
`35`	`35`	`*/`
`36`		`-SEGseg_in(charstr);`
`37`		`-charseg_out(SEGseg);`
`38`		`-float4seg_lower(SEG*seg);`
`39`		`-float4seg_upper(SEG*seg);`
`40`		`-float4seg_center(SEG*seg);`
	`36`	`+PG_FUNCTION_INFO_V1(seg_in);`
	`37`	`+PG_FUNCTION_INFO_V1(seg_out);`
	`38`	`+PG_FUNCTION_INFO_V1(seg_lower);`
	`39`	`+PG_FUNCTION_INFO_V1(seg_upper);`
	`40`	`+PG_FUNCTION_INFO_V1(seg_center);`
	`41`	`+`
	`42`	`+Datumseg_in(PG_FUNCTION_ARGS);`
	`43`	`+Datumseg_out(PG_FUNCTION_ARGS);`
	`44`	`+Datumseg_lower(PG_FUNCTION_ARGS);`
	`45`	`+Datumseg_upper(PG_FUNCTION_ARGS);`
	`46`	`+Datumseg_center(PG_FUNCTION_ARGS);`
`41`	`47`
`42`	`48`	`/*`
`43`	`49`	`** GiST support methods`
`@@ -98,9 +104,10 @@ intsignificant_digits(char *s);`
`98`	`104`	`* Input/Output functions`
`99`	`105`	`*****************************************************************************/`
`100`	`106`
`101`		`-SEG*`
`102`		`-seg_in(char*str)`
	`107`	`+Datum`
	`108`	`+seg_in(PG_FUNCTION_ARGS)`
`103`	`109`	`{`
	`110`	`+char*str=PG_GETARG_CSTRING(0);`
`104`	`111`	`SEG*result=palloc(sizeof(SEG));`
`105`	`112`
`106`	`113`	`seg_scanner_init(str);`
`@@ -110,18 +117,16 @@ seg_in(char *str)`
`110`	`117`
`111`	`118`	`seg_scanner_finish();`
`112`	`119`
`113`		`-return(result);`
	`120`	`+PG_RETURN_POINTER(result);`
`114`	`121`	`}`
`115`	`122`
`116`		`-char*`
`117`		`-seg_out(SEG*seg)`
	`123`	`+Datum`
	`124`	`+seg_out(PG_FUNCTION_ARGS)`
`118`	`125`	`{`
	`126`	`+SEGseg= (SEG)PG_GETARG_POINTER(0);`
`119`	`127`	`char*result;`
`120`	`128`	`char*p;`
`121`	`129`
`122`		`-if (seg==NULL)`
`123`		`-return (NULL);`
`124`		`-`
`125`	`130`	`p=result= (char*)palloc(40);`
`126`	`131`
`127`	`132`	`if (seg->l_ext=='>'\|\|seg->l_ext=='<'\|\|seg->l_ext=='~')`
`@@ -153,25 +158,31 @@ seg_out(SEG * seg)`
`153`	`158`	`}`
`154`	`159`	`}`
`155`	`160`
`156`		`-return(result);`
	`161`	`+PG_RETURN_CSTRING(result);`
`157`	`162`	`}`
`158`	`163`
`159`		`-float4`
`160`		`-seg_center(SEG*seg)`
	`164`	`+Datum`
	`165`	`+seg_center(PG_FUNCTION_ARGS)`
`161`	`166`	`{`
`162`		`-return ((float)seg->lower+ (float)seg->upper) /2.0;`
	`167`	`+SEGseg= (SEG)PG_GETARG_POINTER(0);`
	`168`	`+`
	`169`	`+PG_RETURN_FLOAT4(((float)seg->lower+ (float)seg->upper) /2.0);`
`163`	`170`	`}`
`164`	`171`
`165`		`-float4`
`166`		`-seg_lower(SEG*seg)`
	`172`	`+Datum`
	`173`	`+seg_lower(PG_FUNCTION_ARGS)`
`167`	`174`	`{`
`168`		`-returnseg->lower;`
	`175`	`+SEGseg= (SEG)PG_GETARG_POINTER(0);`
	`176`	`+`
	`177`	`+PG_RETURN_FLOAT4(seg->lower);`
`169`	`178`	`}`
`170`	`179`
`171`		`-float4`
`172`		`-seg_upper(SEG*seg)`
	`180`	`+Datum`
	`181`	`+seg_upper(PG_FUNCTION_ARGS)`
`173`	`182`	`{`
`174`		`-returnseg->upper;`
	`183`	`+SEGseg= (SEG)PG_GETARG_POINTER(0);`
	`184`	`+`
	`185`	`+PG_RETURN_FLOAT4(seg->upper);`
`175`	`186`	`}`
`176`	`187`
`177`	`188`

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!

Commit05ace73

File tree

1 file changed

1 file changed

`‎contrib/seg/seg.c`

0 commit comments