[postgis-devel] make astyle

Olivier Courtin olivier.courtin at oslandia.com
Wed Aug 11 04:03:35 PDT 2010


On Aug 11, 2010, at 12:23 PM, Nicklas Avén wrote:

> Maybe it is only that make astyle has not been used on many files.
> I remember that there were a discussion on the topic some months ago
> that there might be differences.
>
> I attach the patch showing the result of my astyle compared to latest
> trunk. At least in the beginning of the file it looks like quite  
> obvious
> changes that has been done.


I launch on a new local copy (r5809) an astyle with astyle 1.23
i get a lot of diff, but not on exactly on the same files as yours.


On mine:
mac:postgis ol$ svn diff | grep Index
Index: liblwgeom/lwcollection.c
Index: liblwgeom/lwout_wkt.c
Index: liblwgeom/lwpsurface.c
Index: liblwgeom/lwsegmentize.c
Index: liblwgeom/lwspheroid.c
Index: liblwgeom/lwgparse.c
Index: liblwgeom/lex.yy.c
Index: liblwgeom/lwgeom.c
Index: liblwgeom/lwline.c
Index: liblwgeom/g_box.c
Index: liblwgeom/stringbuffer.c
Index: liblwgeom/cunit/cu_out_kml.c
Index: liblwgeom/cunit/cu_polyhedralsurface.c
Index: liblwgeom/cunit/cu_libgeom.c
Index: liblwgeom/cunit/cu_wkb.c
Index: liblwgeom/cunit/cu_geodetic.c
Index: liblwgeom/cunit/cu_out_svg.c
Index: liblwgeom/cunit/cu_algorithm.c
Index: liblwgeom/cunit/cu_out_geojson.c
Index: liblwgeom/cunit/cu_print.c
Index: liblwgeom/cunit/cu_homogenize.c
Index: liblwgeom/cunit/cu_wkt.c
Index: liblwgeom/cunit/cu_tester.c
Index: liblwgeom/cunit/cu_out_gml.c
Index: liblwgeom/g_serialized.c
Index: liblwgeom/lwhomogenize.c
Index: liblwgeom/lwout_gml.c
Index: liblwgeom/lwout_kml.c
Index: liblwgeom/lwout_wkb.c
Index: liblwgeom/ptarray.c
Index: liblwgeom/lwgeodetic.c
Index: postgis/geography_inout.c
Index: postgis/lwgeom_gist.c
Index: postgis/lwgeom_geos_split.c
Index: postgis/lwgeom_export.c
Index: postgis/lwgeom_inout.c
Index: postgis/lwgeom_ogc.c
Index: postgis/lwgeom_geos.c
Index: postgis/lwgeom_geos_clean.c
Index: postgis/lwgeom_in_gml.c
Index: postgis/lwgeom_in_kml.c
Index: loader/structure.c
Index: loader/cunit/cu_list.c
Index: loader/cunit/Makefile
Index: loader/shp2pgsql-gui.c
Index: loader/shp2pgsql-core.c
Index: extras/wkb_reader/readwkb.c


 From your diff:
Index: extras/wkb_reader/readwkb.c
Index: liblwgeom/cunit/cu_algorithm.c
Index: liblwgeom/cunit/cu_geodetic.c
Index: liblwgeom/cunit/cu_homogenize.c
Index: liblwgeom/cunit/cu_libgeom.c
Index: liblwgeom/cunit/cu_out_geojson.c
Index: liblwgeom/cunit/cu_out_gml.c
Index: liblwgeom/cunit/cu_out_kml.c
Index: liblwgeom/cunit/cu_out_svg.c
Index: liblwgeom/cunit/cu_polyhedralsurface.c
Index: liblwgeom/cunit/cu_print.c
Index: liblwgeom/cunit/cu_tester.c
Index: liblwgeom/cunit/cu_wkb.c
Index: liblwgeom/cunit/cu_wkt.c
Index: liblwgeom/g_box.c
Index: liblwgeom/g_serialized.c
Index: liblwgeom/lwcollection.c
Index: liblwgeom/lwgeodetic.c
Index: liblwgeom/lwgeom.c
Index: liblwgeom/lwgparse.c
Index: liblwgeom/lwhomogenize.c
Index: liblwgeom/lwline.c
Index: liblwgeom/lwout_gml.c
Index: liblwgeom/lwout_kml.c
Index: liblwgeom/lwout_wkb.c
Index: liblwgeom/lwout_wkt.c
Index: liblwgeom/lwpsurface.c
Index: liblwgeom/lwsegmentize.c
Index: liblwgeom/lwspheroid.c
Index: liblwgeom/ptarray.c
Index: liblwgeom/stringbuffer.c
Index: loader/shp2pgsql-core.c
Index: loader/shp2pgsql-gui.c
Index: postgis/geography_inout.c
Index: postgis/lwgeom_export.c
Index: postgis/lwgeom_geos.c
Index: postgis/lwgeom_geos_clean.c
Index: postgis/lwgeom_geos_split.c
Index: postgis/lwgeom_gist.c
Index: postgis/lwgeom_in_gml.c
Index: postgis/lwgeom_in_kml.c
Index: postgis/lwgeom_inout.c
Index: postgis/lwgeom_ogc.c



For information what is the astyle version you use Nicklas ?


There's a lot of files (in the two list) impacted
by some previous commits of mine.

I could apply a make astyle commit quite soon,
as soon as i finish the #561 (impact a lot of files)


P.S: if someone have a  .vimrc compliant with astyle
          settings i'm interrested :)


--
Olivier


More information about the postgis-devel mailing list