[PATCH STABLE] exewrapper: apply clang-format to silence test-check-clang-format.t
Augie Fackler
raf at durin42.com
Tue Oct 23 10:50:15 EDT 2018
queued for stable, thanks
> On Oct 23, 2018, at 08:28, Yuya Nishihara <yuya at tcha.org> wrote:
>
> # HG changeset patch
> # User Yuya Nishihara <yuya at tcha.org>
> # Date 1540295181 -32400
> # Tue Oct 23 20:46:21 2018 +0900
> # Branch stable
> # Node ID 36ba91e069486f8283199f92d6d3d19b8580e85c
> # Parent 7b48c616431d49f6ccff4cbbd155a27c46a14ff0
> exewrapper: apply clang-format to silence test-check-clang-format.t
>
> diff --git a/mercurial/exewrapper.c b/mercurial/exewrapper.c
> --- a/mercurial/exewrapper.c
> +++ b/mercurial/exewrapper.c
> @@ -25,7 +25,7 @@ int strcpy_s(char *d, size_t n, const ch
>
> #define _tcscpy_s strcpy_s
> #define _tcscat_s strcat_s
> -#define _countof(array) (sizeof(array)/sizeof(array[0]))
> +#define _countof(array) (sizeof(array) / sizeof(array[0]))
> #endif
>
> static TCHAR pyscript[MAX_PATH + 10];
> @@ -43,7 +43,7 @@ int _tmain(int argc, TCHAR *argv[])
> HANDLE hfind;
> const char *err;
> HMODULE pydll;
> - void(__cdecl * Py_SetPythonHome)(TCHAR *home);
> + void(__cdecl * Py_SetPythonHome)(TCHAR * home);
> int(__cdecl * Py_Main)(int argc, TCHAR *argv[]);
>
> if (GetModuleFileName(NULL, pyscript, _countof(pyscript)) == 0) {
> @@ -86,11 +86,12 @@ int _tmain(int argc, TCHAR *argv[])
> scenario, so let's load python dll from this dir. */
> FindClose(hfind);
> _tcscpy_s(pydllfile, _countof(pydllfile), pyhome);
> - _tcscat_s(pydllfile, _countof(pydllfile), _T("\\") _T(HGPYTHONLIB)
> - _T(".dll"));
> + _tcscat_s(pydllfile, _countof(pydllfile),
> + _T("\\") _T(HGPYTHONLIB) _T(".dll"));
> pydll = LoadLibrary(pydllfile);
> if (pydll == NULL) {
> - err = "failed to load private Python DLL " HGPYTHONLIB ".dll";
> + err = "failed to load private Python DLL " HGPYTHONLIB
> + ".dll";
> goto bail;
> }
> Py_SetPythonHome =
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
More information about the Mercurial-devel
mailing list