Re: svn commit: r1355692 - in /subversion/trunk/subversion: libsvn_wc/conflicts.c libsvn_wc/conflicts.h libsvn_wc/wc_db.c tests/libsvn_wc/conflict-data-test.c

"Bert Huijben" <bert_at_qqmail.nl> writes:

> Const would be nice, but would give a compile error in all these locations.
>
> conflict__get_conflict() is a static function that return a non const skel
> to allow editing/extending the skel.

It doesn't really need a double underscore if it is static.

> I'm not sure where to bend the rules on const, but with my compiler not
> giving all the same warnings as gcc I try to keep on the safe side.

I'm currently getting:

../src/subversion/libsvn_wc/conflicts.c:622: warning: passing argument 1 of ‘conflict__read_location’ from incompatible pointer type

If I make the parameter const I get:

../src/subversion/libsvn_wc/conflicts.c:625: warning: assignment discards qualifiers from pointer target type

-- 
Cerified & Supported Apache Subversion Downloads:
http://www.wandisco.com/subversion/download