Commit6216e84

committed

Make ECPGraise's str parameter const to suppress warnings from gcc

and errors from pickier compilers.

1 parent3b192c2 commit6216e84Copy full SHA for 6216e84

File tree

-6

lines changed

-6

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ extern"C"`
`34`	`34`	`constchardescriptor,constcharquery);`
`35`	`35`	`boolECPGdeallocate_desc(intline,constchar*name);`
`36`	`36`	`boolECPGallocate_desc(intline,constchar*name);`
`37`		`-voidECPGraise(intline,intcode,char*str);`
	`37`	`+voidECPGraise(intline,intcode,constchar*str);`
`38`	`38`	`boolECPGget_desc_header(int,char,int);`
`39`	`39`	`boolECPGget_desc(int,char*,int,...);`
`40`	`40`

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#include<sqlca.h>`
`8`	`8`
`9`	`9`	`void`
`10`		`-ECPGraise(intline,intcode,char*str)`
	`10`	`+ECPGraise(intline,intcode,constchar*str)`
`11`	`11`	`{`
`12`	`12`	`sqlca.sqlcode=code;`
`13`	`13`
`@@ -119,13 +119,15 @@ ECPGraise(int line, int code, char *str)`
`119`	`119`	`break;`
`120`	`120`
`121`	`121`	`caseECPG_PGSQL:`
	`122`	`+{`
	`123`	`+intslen=strlen(str);`
`122`	`124`	`/* strip trailing newline */`
`123`		`-if (str[strlen(str)-1]=='\n')`
`124`		`-str[strlen(str)-1]='\0';`
`125`		`-`
	`125`	`+if (slen>0&&str[slen-1]=='\n')`
	`126`	`+slen--;`
`126`	`127`	`snprintf(sqlca.sqlerrm.sqlerrmc,sizeof(sqlca.sqlerrm.sqlerrmc),`
`127`		`-"'%s' in line %d.",str,line);`
	`128`	`+"'%.*s' in line %d.",slen,str,line);`
`128`	`129`	`break;`
	`130`	`+}`
`129`	`131`
`130`	`132`	`caseECPG_TRANS:`
`131`	`133`	`snprintf(sqlca.sqlerrm.sqlerrmc,sizeof(sqlca.sqlerrm.sqlerrmc),`

Comments

(0)