Author: svn-role
Date: Thu May 28 04:00:16 2020
New Revision: 1878213
URL: http://svn.apache.org/viewvc?rev=1878213&view=rev
Log:
Merge r1877259 from trunk:
* r1877259
Move variable declarations to the start of block the to fix
syntax errors with VC9 (Visual Studio 2008).
Justification:
Our code should be C90.
Votes:
+1: brane, stsp, jcorvel
+0: danielsh (from dev@)
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
Propchange: subversion/branches/1.14.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1877259
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1878213&r1=1878212&r2=1878213&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Thu May 28 04:00:16 2020
@@ -54,12 +54,3 @@ Veto-blocked changes:
Approved changes:
=================
-
-* r1877259
- Move variable declarations to the start of block the to fix
- syntax errors with VC9 (Visual Studio 2008).
- Justification:
- Our code should be C90.
- Votes:
- +1: brane, stsp, jcorvel
- +0: danielsh (from dev@)
Modified:
subversion/branches/1.14.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c?rev=1878213&r1=1878212&r2=1878213&view=diff
==============================================================================
---
subversion/branches/1.14.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
(original)
+++
subversion/branches/1.14.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
Thu May 28 04:00:16 2020
@@ -1171,6 +1171,7 @@ apr_hash_t *svn_swig_py_stringhash_from_
PyObject *key = PyList_GetItem(keys, i);
PyObject *value = PyDict_GetItem(dict, key);
const char *propname = make_string_from_ob(key, pool);
+ const char *propval;
if (!propname)
{
if (!PyErr_Occurred())
@@ -1180,7 +1181,7 @@ apr_hash_t *svn_swig_py_stringhash_from_
Py_DECREF(keys);
return NULL;
}
- const char *propval = make_string_from_ob_maybe_null(value, pool);
+ propval = make_string_from_ob_maybe_null(value, pool);
if (PyErr_Occurred())
{
Py_DECREF(keys);
@@ -1215,6 +1216,7 @@ apr_hash_t *svn_swig_py_mergeinfo_from_d
PyObject *key = PyList_GetItem(keys, i);
PyObject *value = PyDict_GetItem(dict, key);
const char *pathname = make_string_from_ob(key, pool);
+ const svn_rangelist_t *ranges;
if (!pathname)
{
if (!PyErr_Occurred())
@@ -1224,7 +1226,7 @@ apr_hash_t *svn_swig_py_mergeinfo_from_d
Py_DECREF(keys);
return NULL;
}
- const svn_rangelist_t *ranges = svn_swig_py_seq_to_array(value,
+ ranges = svn_swig_py_seq_to_array(value,
sizeof(const svn_merge_range_t *),
svn_swig_py_unwrap_struct_ptr,
svn_swig_TypeQuery("svn_merge_range_t *"),
@@ -1314,6 +1316,7 @@ apr_hash_t *svn_swig_py_prophash_from_di
PyObject *key = PyList_GetItem(keys, i);
PyObject *value = PyDict_GetItem(dict, key);
const char *propname = make_string_from_ob(key, pool);
+ svn_string_t *propval;
if (!propname)
{
if (!PyErr_Occurred())
@@ -1323,7 +1326,7 @@ apr_hash_t *svn_swig_py_prophash_from_di
Py_DECREF(keys);
return NULL;
}
- svn_string_t *propval = make_svn_string_from_ob_maybe_null(value, pool);
+ propval = make_svn_string_from_ob_maybe_null(value, pool);
if (PyErr_Occurred())
{
Py_DECREF(keys);
