Commit6bb9d30

committed

Fix compiler warning.

get_user_name returns const char *, but we were assigning the resultto a char * variable.

1 parent001a573 commit6bb9d30Copy full SHA for 6bb9d30

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -443,7 +443,7 @@ voidcheck_pghost_envvar(void);`
`443`	`443`	`/* util.c */`
`444`	`444`
`445`	`445`	`charquote_identifier(constchars);`
`446`		`-intget_user_info(char**user_name);`
	`446`	`+intget_user_info(char**user_name_p);`
`447`	`447`	`voidcheck_ok(void);`
`448`	`448`	`void`
`449`	`449`	`report_status(eLogTypetype,constchar*fmt,...)`

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -205,9 +205,10 @@ quote_identifier(const char *s)`
`205`	`205`	`* get_user_info()`
`206`	`206`	`*/`
`207`	`207`	`int`
`208`		`-get_user_info(char**user_name)`
	`208`	`+get_user_info(char**user_name_p)`
`209`	`209`	`{`
`210`	`210`	`intuser_id;`
	`211`	`+constchar*user_name;`
`211`	`212`	`char*errstr;`
`212`	`213`
`213`	`214`	`#ifndefWIN32`
`@@ -216,12 +217,12 @@ get_user_info(char **user_name)`
`216`	`217`	`user_id=1;`
`217`	`218`	`#endif`
`218`	`219`
`219`		`-*user_name=get_user_name(&errstr);`
`220`		`-if (!*user_name)`
	`220`	`+user_name=get_user_name(&errstr);`
	`221`	`+if (!user_name)`
`221`	`222`	`pg_fatal("%s\n",errstr);`
`222`	`223`
`223`	`224`	`/* make a copy */`
`224`		`-user_name=pg_strdup(user_name);`
	`225`	`+*user_name_p=pg_strdup(user_name);`
`225`	`226`
`226`	`227`	`returnuser_id;`
`227`	`228`	`}`

Comments

(0)