Author: dsahlberg
Date: Sun Sep 15 10:56:28 2024
New Revision: 1920671
URL: http://svn.apache.org/viewvc?rev=1920671&view=rev
Log:
On the 'cmake' branch: Catchup merge with /trunk, merging r1919535 and
r1920521
* subversion/svnlook/svnlook.c
(sub_main, handling option l): Re-use existing err pointer
* build\generator\extractor.py
(__main__): Just a comment
Modified:
subversion/branches/cmake/ (props changed)
subversion/branches/cmake/build/generator/extractor.py
subversion/branches/cmake/subversion/svnlook/svnlook.c
Propchange: subversion/branches/cmake/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1920507-1920670
Modified: subversion/branches/cmake/build/generator/extractor.py
URL:
http://svn.apache.org/viewvc/subversion/branches/cmake/build/generator/extractor.py?rev=1920671&r1=1920670&r2=1920671&view=diff
==============================================================================
--- subversion/branches/cmake/build/generator/extractor.py (original)
+++ subversion/branches/cmake/build/generator/extractor.py Sun Sep 15 10:56:28
2024
@@ -67,6 +67,8 @@ if __name__ == '__main__':
for func in extract_funcs(fname):
print(func)
if os.path.basename(fname) == 'svn_ctype.h':
+ # See libsvn_subr/ctype.c for an explanation why we use CONSTANT and not
+ # DATA, even though it causes an LNK4087 warning!
print('svn_ctype_table = svn_ctype_table_internal CONSTANT')
elif os.path.basename(fname) == 'svn_wc_private.h':
# svn_wc__internal_walk_children() is now internal to libsvn_wc
Modified: subversion/branches/cmake/subversion/svnlook/svnlook.c
URL:
http://svn.apache.org/viewvc/subversion/branches/cmake/subversion/svnlook/svnlook.c?rev=1920671&r1=1920670&r2=1920671&view=diff
==============================================================================
--- subversion/branches/cmake/subversion/svnlook/svnlook.c (original)
+++ subversion/branches/cmake/subversion/svnlook/svnlook.c Sun Sep 15 10:56:28
2024
@@ -2584,7 +2584,7 @@ sub_main(int *exit_code, int argc, const
{
const char *utf8_opt_arg;
SVN_ERR(svn_utf_cstring_to_utf8(&utf8_opt_arg, opt_arg, pool));
- svn_error_t *err = svn_cstring_atoi(&opt_state.limit,
utf8_opt_arg);
+ err = svn_cstring_atoi(&opt_state.limit, utf8_opt_arg);
if (err)
{
return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, err ,
