Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix incorrect delimator ";" used to separate proj_info().searchpath entries #1497

Merged
merged 1 commit into from Jun 4, 2019

Conversation

@nyalldawson
Copy link
Contributor

commented Jun 2, 2019

... on non-windows platforms, should be ":", not ";"

@nyalldawson

This comment has been minimized.

Copy link
Contributor Author

commented Jun 2, 2019

@nyalldawson nyalldawson force-pushed the nyalldawson:fix_searchpath_sep branch from 9ed2ecf to 32d66ea Jun 2, 2019

src/4D_api.cpp Outdated Show resolved Hide resolved
Fix incorrect delimator ";" used to separate proj_info().searchpath
entries on non-windows platforms, should be ":"

@nyalldawson nyalldawson force-pushed the nyalldawson:fix_searchpath_sep branch from 32d66ea to a7a7651 Jun 3, 2019

@rouault

This comment has been minimized.

Copy link
Member

commented Jun 3, 2019

@kbevers Do you think we should change the behaviour or keep as it ? After all, the implementation and documentation are consistent currently.
It is true that if we do the analogy with PATH, semi-colon for Windows and colon for Unix are more common.
When looking at the code, I was confused by the fact that path_append() has a #ifdef WIN32 / #else to have a different separator, but it isn't actually used

@kbevers

This comment has been minimized.

Copy link
Member

commented Jun 3, 2019

Do you think we should change the behaviour or keep as it ? After all, the implementation and documentation are consistent currently.
It is true that if we do the analogy with PATH, semi-colon for Windows and colon for Unix are more common.

I think we should accept this PR. As you say, it conforms to normal practice. I believe this is also how we deal with delimeters when parsing PROJ_LIB, right?

When looking at the code, I was confused by the fact that path_append() has a #ifdef WIN32 / #else to have a different separator, but it isn't actually used

That is clearly a bug - delim should have been used in the first place.

@kbevers kbevers added the backport 6.1 label Jun 4, 2019

@kbevers kbevers added this to the 6.1.1 milestone Jun 4, 2019

@kbevers kbevers merged commit 21ce6dd into OSGeo:master Jun 4, 2019

4 checks passed

FreeBSD Task Summary
Details
Travis CI - Pull Request Build Passed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
coverage/coveralls Coverage remained the same at 85.907%
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.