NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commitfecbeed

Michael Meskes

committed

Re-added Tom's patch fixing my setlocale patch. I accidently

deleted it.

1 parentf02ffdf commitfecbeedCopy full SHA for fecbeed

File tree

2 files changed

+19

-8

lines changed

src/interfaces/ecpg
- ChangeLog
- lib
  - execute.c

2 files changed

+19

-8

lines changed

`‎src/interfaces/ecpg/ChangeLog‎`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1107,5 +1107,10 @@ Mon Okt 1 13:49:40 CEST 2001`
`1107`	`1107`	`- Fixed truncate bug.`
`1108`	`1108`	`- Added patch by Christof Petig <christof.petig@wtal.de> to clean up`
`1109`	`1109`	`ecpglib.`
	`1110`	`+`
	`1111`	`+TUe Okt 2 16:09:26 CEST 2001`
	`1112`	`+`
	`1113`	`+- Re-added Tom's patch fixing my setlocale patch. I accidently`
	`1114`	`+ deleted it.`
`1110`	`1115`	`- Set ecpg version to 2.9.0.`
`1111`	`1116`	`- Set library version to 3.3.0.`

`‎src/interfaces/ecpg/lib/execute.c‎`

Lines changed: 14 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c,v 1.26 2001/10/01 12:02:28 meskes Exp $ */`
	`1`	`+/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c,v 1.27 2001/10/02 14:08:28 meskes Exp $ */`
`2`	`2`
`3`	`3`	`/*`
`4`	`4`	`* The aim is to get a simpler inteface to the database routines.`
`@@ -1040,23 +1040,26 @@ ECPGdo(int lineno, const char connection_name, char query,...)`
`1040`	`1040`	`va_listargs;`
`1041`	`1041`	`structstatement*stmt;`
`1042`	`1042`	`structconnection*con=get_connection(connection_name);`
`1043`		`-boolstatus= true;`
`1044`		`-char*locale;`
	`1043`	`+boolstatus;`
	`1044`	`+char*oldlocale;`
`1045`	`1045`
`1046`	`1046`	`/* Make sure we do NOT honor the locale for numeric input/output */`
`1047`	`1047`	`/* since the database wants the standard decimal point */`
`1048`		`-locale=setlocale(LC_NUMERIC,"C");`
	`1048`	`+oldlocale=strdup(setlocale(LC_NUMERIC,NULL));`
	`1049`	`+setlocale(LC_NUMERIC,"C");`
`1049`	`1050`
`1050`	`1051`	`if (!ecpg_init(con,connection_name,lineno))`
`1051`	`1052`	`{`
`1052`		`-setlocale(LC_NUMERIC,locale);`
	`1053`	`+setlocale(LC_NUMERIC,oldlocale);`
	`1054`	`+free(oldlocale);`
`1053`	`1055`	`return (false);`
`1054`	`1056`	`}`
`1055`	`1057`
`1056`	`1058`	`va_start(args,query);`
`1057`	`1059`	`if (create_statement(lineno,con,&stmt,query,args)== false)`
`1058`	`1060`	`{`
`1059`		`-setlocale(LC_NUMERIC,locale);`
	`1061`	`+setlocale(LC_NUMERIC,oldlocale);`
	`1062`	`+free(oldlocale);`
`1060`	`1063`	`return (false);`
`1061`	`1064`	`}`
`1062`	`1065`	`va_end(args);`
`@@ -1067,15 +1070,18 @@ ECPGdo(int lineno, const char connection_name, char query,...)`
`1067`	`1070`	`free_statement(stmt);`
`1068`	`1071`	`ECPGlog("ECPGdo: not connected to %s\n",con->name);`
`1069`	`1072`	`ECPGraise(lineno,ECPG_NOT_CONN,NULL);`
`1070`		`-setlocale(LC_NUMERIC,locale);`
	`1073`	`+setlocale(LC_NUMERIC,oldlocale);`
	`1074`	`+free(oldlocale);`
`1071`	`1075`	`return false;`
`1072`	`1076`	`}`
`1073`	`1077`
`1074`	`1078`	`status=ECPGexecute(stmt);`
`1075`	`1079`	`free_statement(stmt);`
`1076`	`1080`
`1077`	`1081`	`/* and reset locale value so our application is not affected */`
`1078`		`-setlocale(LC_NUMERIC,locale);`
	`1082`	`+setlocale(LC_NUMERIC,oldlocale);`
	`1083`	`+free(oldlocale);`
	`1084`	`+`
`1079`	`1085`	`return (status);`
`1080`	`1086`	`}`
`1081`	`1087`

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!

Commitfecbeed

File tree

2 files changed

2 files changed

`‎src/interfaces/ecpg/ChangeLog‎`

`‎src/interfaces/ecpg/lib/execute.c‎`

0 commit comments