This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8330

cext: move more variable declarations to the top of the block for C89 support
AbandonedPublic

Authored by mharbison72 on Mar 25 2020, 4:33 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

These instances aren't compiled on Windows, so they don't matter much. But they
do get flagged by -Werror=declaration-after-statement in the next patch.

setup: build C extensions with -Werror=declaration-after-statement

MSVC 2008 still needs declarations at the top of the scope. I added it to the
3rd party code too in case somebody vendors a new version with a problem-
they'll get an early warning. Clang seems to ignore this (at least on 10.14
with Xcode 10), and gcc 7.4 will error out as desired on Ubuntu 18.04. Thanks
to Yuya for remembering the name of the option.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

mharbison72 created this revision.Mar 25 2020, 4:33 PM
mharbison72 abandoned this revision.Mar 25 2020, 4:36 PM

This was a test run of phabsend --fold to show what the UI looks like. It's a fold of D8317 and D8318 (with the URLs removed).

Revision Contents
Changeset List

PathPackages
Mmercurial/cext/osutil.c (5 lines)
Msetup.py (26 lines)

Diff 20885

mercurial/cext/osutil.c

if (argv != NULL) if (argv != NULL)
argvend = argvstart = argv[0]; argvend = argvstart = argv[0];
else else
argvend = argvstart = NULL; argvend = argvstart = NULL;
/* Check the memory we can use. Typically, argv[i] and /* Check the memory we can use. Typically, argv[i] and
* argv[i + 1] are continuous. */ * argv[i + 1] are continuous. */
for (i = 0; i < argc; ++i) { for (i = 0; i < argc; ++i) {
size_t len;
if (argv[i] > argvend || argv[i] < argvstart) if (argv[i] > argvend || argv[i] < argvstart)
break; /* not continuous */ break; /* not continuous */
size_t len = strlen(argv[i]); len = strlen(argv[i]);
argvend = argv[i] + len + 1 /* '\0' */; argvend = argv[i] + len + 1 /* '\0' */;
} }
if (argvend > argvstart) /* sanity check */ if (argvend > argvstart) /* sanity check */
argvsize = argvend - argvstart; argvsize = argvend - argvstart;
} }
if (argvstart && argvsize > 1) { if (argvstart && argvsize > 1) {
int n = snprintf(argvstart, argvsize, "%s", name); int n = snprintf(argvstart, argvsize, "%s", name);
return Py_BuildValue(PY23("s", "y"), buf.f_mntonname); return Py_BuildValue(PY23("s", "y"), buf.f_mntonname);
} }
#endif /* defined(HAVE_BSD_STATFS) */ #endif /* defined(HAVE_BSD_STATFS) */
static PyObject *unblocksignal(PyObject *self, PyObject *args) static PyObject *unblocksignal(PyObject *self, PyObject *args)
{ {
int sig = 0; int sig = 0;
int r; int r;
sigset_t set;
if (!PyArg_ParseTuple(args, "i", &sig)) if (!PyArg_ParseTuple(args, "i", &sig))
return NULL; return NULL;
sigset_t set;
r = sigemptyset(&set); r = sigemptyset(&set);
if (r != 0) if (r != 0)
return PyErr_SetFromErrno(PyExc_OSError); return PyErr_SetFromErrno(PyExc_OSError);
r = sigaddset(&set, sig); r = sigaddset(&set, sig);
if (r != 0) if (r != 0)
return PyErr_SetFromErrno(PyExc_OSError); return PyErr_SetFromErrno(PyExc_OSError);
r = sigprocmask(SIG_UNBLOCK, &set, NULL); r = sigprocmask(SIG_UNBLOCK, &set, NULL);
if (r != 0) if (r != 0)

setup.py

common_depends = [ common_depends = [
'mercurial/bitmanipulation.h', 'mercurial/bitmanipulation.h',
'mercurial/compat.h', 'mercurial/compat.h',
'mercurial/cext/util.h', 'mercurial/cext/util.h',
] ]
common_include_dirs = ['mercurial'] common_include_dirs = ['mercurial']
common_cflags = []
# MSVC 2008 still needs declarations at the top of the scope.
if os.name != 'nt':
common_cflags = ['-Werror=declaration-after-statement']
osutil_cflags = [] osutil_cflags = []
osutil_ldflags = [] osutil_ldflags = []
# platform specific macros # platform specific macros
for plat, func in [('bsd', 'setproctitle')]: for plat, func in [('bsd', 'setproctitle')]:
if re.search(plat, sys.platform) and hasfunction(new_compiler(), func): if re.search(plat, sys.platform) and hasfunction(new_compiler(), func):
osutil_cflags.append('-DHAVE_%s' % func.upper()) osutil_cflags.append('-DHAVE_%s' % func.upper())
) )
extmodules = [ extmodules = [
Extension( Extension(
'mercurial.cext.base85', 'mercurial.cext.base85',
['mercurial/cext/base85.c'], ['mercurial/cext/base85.c'],
include_dirs=common_include_dirs, include_dirs=common_include_dirs,
extra_compile_args=common_cflags,
depends=common_depends, depends=common_depends,
), ),
Extension( Extension(
'mercurial.cext.bdiff', 'mercurial.cext.bdiff',
['mercurial/bdiff.c', 'mercurial/cext/bdiff.c'] + xdiff_srcs, ['mercurial/bdiff.c', 'mercurial/cext/bdiff.c'] + xdiff_srcs,
include_dirs=common_include_dirs, include_dirs=common_include_dirs,
extra_compile_args=common_cflags,
depends=common_depends + ['mercurial/bdiff.h'] + xdiff_headers, depends=common_depends + ['mercurial/bdiff.h'] + xdiff_headers,
), ),
Extension( Extension(
'mercurial.cext.mpatch', 'mercurial.cext.mpatch',
['mercurial/mpatch.c', 'mercurial/cext/mpatch.c'], ['mercurial/mpatch.c', 'mercurial/cext/mpatch.c'],
include_dirs=common_include_dirs, include_dirs=common_include_dirs,
extra_compile_args=common_cflags,
depends=common_depends, depends=common_depends,
), ),
Extension( Extension(
'mercurial.cext.parsers', 'mercurial.cext.parsers',
[ [
'mercurial/cext/charencode.c', 'mercurial/cext/charencode.c',
'mercurial/cext/dirs.c', 'mercurial/cext/dirs.c',
'mercurial/cext/manifest.c', 'mercurial/cext/manifest.c',
'mercurial/cext/parsers.c', 'mercurial/cext/parsers.c',
'mercurial/cext/pathencode.c', 'mercurial/cext/pathencode.c',
'mercurial/cext/revlog.c', 'mercurial/cext/revlog.c',
], ],
include_dirs=common_include_dirs, include_dirs=common_include_dirs,
extra_compile_args=common_cflags,
depends=common_depends depends=common_depends
+ ['mercurial/cext/charencode.h', 'mercurial/cext/revlog.h',], + ['mercurial/cext/charencode.h', 'mercurial/cext/revlog.h',],
), ),
Extension( Extension(
'mercurial.cext.osutil', 'mercurial.cext.osutil',
['mercurial/cext/osutil.c'], ['mercurial/cext/osutil.c'],
include_dirs=common_include_dirs, include_dirs=common_include_dirs,
extra_compile_args=osutil_cflags, extra_compile_args=common_cflags + osutil_cflags,
extra_link_args=osutil_ldflags, extra_link_args=osutil_ldflags,
depends=common_depends, depends=common_depends,
), ),
Extension( Extension(
'mercurial.thirdparty.zope.interface._zope_interface_coptimizations', 'mercurial.thirdparty.zope.interface._zope_interface_coptimizations',
[ [
'mercurial/thirdparty/zope/interface/_zope_interface_coptimizations.c', 'mercurial/thirdparty/zope/interface/_zope_interface_coptimizations.c',
], ],
extra_compile_args=common_cflags,
), ),
Extension( Extension(
'mercurial.thirdparty.sha1dc', 'mercurial.thirdparty.sha1dc',
[ [
'mercurial/thirdparty/sha1dc/cext.c', 'mercurial/thirdparty/sha1dc/cext.c',
'mercurial/thirdparty/sha1dc/lib/sha1.c', 'mercurial/thirdparty/sha1dc/lib/sha1.c',
'mercurial/thirdparty/sha1dc/lib/ubc_check.c', 'mercurial/thirdparty/sha1dc/lib/ubc_check.c',
], ],
extra_compile_args=common_cflags,
), ),
Extension( Extension(
'hgext.fsmonitor.pywatchman.bser', ['hgext/fsmonitor/pywatchman/bser.c'] 'hgext.fsmonitor.pywatchman.bser',
['hgext/fsmonitor/pywatchman/bser.c'],
extra_compile_args=common_cflags,
), ),
RustStandaloneExtension( RustStandaloneExtension(
'mercurial.rustext', 'hg-cpython', 'librusthg', py3_features='python3' 'mercurial.rustext', 'hg-cpython', 'librusthg', py3_features='python3'
), ),
] ]
sys.path.insert(0, 'contrib/python-zstandard') sys.path.insert(0, 'contrib/python-zstandard')
import setup_zstd import setup_zstd
extmodules.append( zstd = setup_zstd.get_c_extension(
setup_zstd.get_c_extension(
name='mercurial.zstd', root=os.path.abspath(os.path.dirname(__file__)) name='mercurial.zstd', root=os.path.abspath(os.path.dirname(__file__))
) )
) zstd.extra_compile_args += common_cflags
extmodules.append(zstd)
try: try:
from distutils import cygwinccompiler from distutils import cygwinccompiler
# the -mno-cygwin option has been deprecated for years # the -mno-cygwin option has been deprecated for years
mingw32compilerclass = cygwinccompiler.Mingw32CCompiler mingw32compilerclass = cygwinccompiler.Mingw32CCompiler
class HackedMingw32CCompiler(cygwinccompiler.Mingw32CCompiler): class HackedMingw32CCompiler(cygwinccompiler.Mingw32CCompiler):