Checkout
Branko ─îibej
committed
on 04 Sep 12
Followup to r1379689: gather version and system information in a structure
instead of a huge string, and make combining it to stdout a separ… Show more
Followup to r1379689: gather version and system information in a structure

instead of a huge string, and make combining it to stdout a separate step.

* subversion/libsvn_subr/sysinfo.h: Inclulde apr_tables.h.

 (svn_sysinfo__linked_lib_t): New struct type.

 (svn_sysinfo__linked_libs): Return an APR array of svn_sysinfo__linked_lib_t

  instead of a preconstructed string.

 (svn_sysinfo__loaded_lib_t): New struct type.

 (svn_sysinfo__loaded_libs): Return an APR array of svn_sysinfo__loaded_lib_t

  instead of a preconstructed string.

* subversion/libsvn_subr/sysinfo.c (svn_sysinfo__linked_libs): Update.

 (svn_sysinfo__loaded_libs): Update.

 (win32_shared_libs): Update, make return value an APR array.

 (release_name_from_uname) Define only unless SVN_HAVE_MACOS_PLIST

  to avoid compiler warnings about unused static function on Mac OS X.

* subversion/libsvn_subr/opt.h: Include apr_tables.h.

 (svn_opt__version_info_t): New struct. Contains all the information that

  was formerly returned in a string by svn_opt__get_version_info.

 (svn_opt__get_version_info): Change signature; returns a svn_opt__version_info_t.

 (svn_opt__print_version_info): Reinstate, but using the outpot from

  svn_opt__get_version_info.

* subversion/libsvn_subr/opt.c (svn_opt__get_version_info): Reimplement.

 (svn_opt__print_version_info): Reinstate.

 (svn_opt_print_help4): Use svn_opt__print_version_info again.

* subversion/libsvn_subr/deprecated.c

 (svn_opt_print_help): Use svn_opt__print_version_info again.

Show less