Commit263db2e

Hiroshi Inoue

committed

Make NAMEDATALEN changeable at compile time.

1 parent87c9636 commit263db2eCopy full SHA for 263db2e

File tree

+15

-10

lines changed

+15

-10

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -645,10 +645,11 @@ CC_connect(ConnectionClass self, char password_req, char salt_para)`
`645`	`645`	`ci->drivers.ksqo,`
`646`	`646`	`ci->drivers.unique_index,`
`647`	`647`	`ci->drivers.use_declarefetch);`
`648`		`-qlog(" text_as_longvarchar=%d, unknowns_as_longvarchar=%d, bools_as_char=%d\n",`
	`648`	`+qlog(" text_as_longvarchar=%d, unknowns_as_longvarchar=%d, bools_as_char=%d NAMEDATALEN=%d\n",`
`649`	`649`	`ci->drivers.text_as_longvarchar,`
`650`	`650`	`ci->drivers.unknowns_as_longvarchar,`
`651`		`-ci->drivers.bools_as_char);`
	`651`	`+ci->drivers.bools_as_char,`
	`652`	`+MAX_TABLE_LEN);`
`652`	`653`
`653`	`654`	`#ifdefMULTIBYTE`
`654`	`655`	`encoding=check_client_encoding(ci->conn_settings);`
`@@ -728,7 +729,7 @@ CC_connect(ConnectionClass self, char password_req, char salt_para)`
`728`	`729`	`SOCK_put_int(sock,htonl(4+sizeof(StartupPacket6_2)),4);`
`729`	`730`	`sp62.authtype=htonl(NO_AUTHENTICATION);`
`730`	`731`	`strncpy(sp62.database,ci->database,PATH_SIZE);`
`731`		`-strncpy(sp62.user,ci->username,NAMEDATALEN);`
	`732`	`+strncpy(sp62.user,ci->username,USRNAMEDATALEN);`
`732`	`733`	`SOCK_put_n_char(sock, (char*)&sp62,sizeof(StartupPacket6_2));`
`733`	`734`	`SOCK_flush_output(sock);`
`734`	`735`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ typedef enum`
`94`	`94`	`#defineNO_AUTHENTICATION7`
`95`	`95`	`#definePATH_SIZE64`
`96`	`96`	`#defineARGV_SIZE64`
`97`		`-#defineNAMEDATALEN16`
	`97`	`+#defineUSRNAMEDATALEN16`
`98`	`98`
`99`	`99`	`typedefunsignedintProtocolVersion;`
`100`	`100`
`@@ -120,7 +120,7 @@ typedef struct _StartupPacket6_2`
`120`	`120`	`{`
`121`	`121`	`unsignedintauthtype;`
`122`	`122`	`chardatabase[PATH_SIZE];`
`123`		`-charuser[NAMEDATALEN];`
	`123`	`+charuser[USRNAMEDATALEN];`
`124`	`124`	`charoptions[ARGV_SIZE];`
`125`	`125`	`charexecfile[ARGV_SIZE];`
`126`	`126`	`chartty[PATH_SIZE];`

Lines changed: 9 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*`
`6`	`6`	`* Comments:See "notice.txt" for copyright and license information.`
`7`	`7`	`*`
`8`		`- * $Id: psqlodbc.h,v 1.68 2002/06/28 02:44:15 inoue Exp $`
	`8`	`+ * $Id: psqlodbc.h,v 1.69 2002/07/11 01:52:46 inoue Exp $`
`9`	`9`	`*`
`10`	`10`	`*/`
`11`	`11`
`@@ -27,6 +27,10 @@`
`27`	`27`	`#defineODBCVER0x0250`
`28`	`28`	`#endif/* ODBCVER_REP */`
`29`	`29`
	`30`	`+#ifndefNAMEDATALEN`
	`31`	`+#defineNAMEDATALEN32`
	`32`	`+#endif/* NAMEDATALEN */`
	`33`	`+`
`30`	`34`
`31`	`35`	`#if defined(WIN32)\|\| defined(WITH_UNIXODBC)\|\| defined(WITH_IODBC)`
`32`	`36`	`#include<sql.h>`
`@@ -124,9 +128,9 @@ typedef UInt4 Oid;`
`124`	`128`	`#defineBYTELEN8`
`125`	`129`	`#defineVARHDRSZsizeof(Int4)`
`126`	`130`
`127`		`-#defineMAX_SCHEMA_LEN32`
`128`		`-#defineMAX_TABLE_LEN32`
`129`		`-#defineMAX_COLUMN_LEN32`
	`131`	`+#defineMAX_SCHEMA_LENNAMEDATALEN`
	`132`	`+#defineMAX_TABLE_LENNAMEDATALEN`
	`133`	`+#defineMAX_COLUMN_LENNAMEDATALEN`
`130`	`134`	`#defineMAX_CURSOR_LEN32`
`131`	`135`
`132`	`136`	`/Registry length limits /`
`@@ -239,7 +243,7 @@ voidlogs_on_off(int cnopen, int, int);`
`239`	`243`	`#defineTEXT_FIELD_SIZE8190/* size of text fields`
`240`	`244`	`* (not including null`
`241`	`245`	`* term) */`
`242`		`-#defineNAME_FIELD_SIZE32/* size of name fields */`
	`246`	`+#defineNAME_FIELD_SIZENAMEDATALEN/* size of name fields */`
`243`	`247`	`#defineMAX_VARCHAR_SIZE254/* maximum size of a varchar (not`
`244`	`248`	`* including null term) */`
`245`	`249`

Comments

(0)