Mercurial > hg
changeset 36226:e1138fc2c4e2
base85: allow clang-format oversight
Differential Revision: https://phab.mercurial-scm.org/D2182
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Mon, 12 Feb 2018 10:39:46 -0500 |
| parents | 6c87d4113a90 |
| children | 69080ee1fb0e |
| files | contrib/clang-format-blacklist mercurial/cext/base85.c |
| diffstat | 2 files changed, 19 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/clang-format-blacklist Mon Feb 12 10:38:11 2018 -0500 +++ b/contrib/clang-format-blacklist Mon Feb 12 10:39:46 2018 -0500 @@ -1,6 +1,5 @@ # Files that just need to be migrated to the formatter. # Do not add new files here! -mercurial/cext/base85.c mercurial/cext/dirs.c mercurial/cext/manifest.c mercurial/cext/mpatch.c
--- a/mercurial/cext/base85.c Mon Feb 12 10:38:11 2018 -0500 +++ b/mercurial/cext/base85.c Mon Feb 12 10:39:46 2018 -0500 @@ -14,8 +14,9 @@ #include "util.h" -static const char b85chars[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ" - "abcdefghijklmnopqrstuvwxyz!#$%&()*+-;<=>?@^_`{|}~"; +static const char b85chars[] = + "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "abcdefghijklmnopqrstuvwxyz!#$%&()*+-;<=>?@^_`{|}~"; static char b85dec[256]; static void b85prep(void) @@ -105,25 +106,25 @@ c = b85dec[(int)*text++] - 1; if (c < 0) return PyErr_Format( - PyExc_ValueError, - "bad base85 character at position %d", - (int)i); + PyExc_ValueError, + "bad base85 character at position %d", + (int)i); acc = acc * 85 + c; } if (i++ < len) { c = b85dec[(int)*text++] - 1; if (c < 0) return PyErr_Format( - PyExc_ValueError, - "bad base85 character at position %d", - (int)i); + PyExc_ValueError, + "bad base85 character at position %d", + (int)i); /* overflow detection: 0xffffffff == "|NsC0", * "|NsC" == 0x03030303 */ if (acc > 0x03030303 || (acc *= 85) > 0xffffffff - c) return PyErr_Format( - PyExc_ValueError, - "bad base85 sequence at position %d", - (int)i); + PyExc_ValueError, + "bad base85 sequence at position %d", + (int)i); acc += c; } @@ -145,23 +146,19 @@ static char base85_doc[] = "Base85 Data Encoding"; static PyMethodDef methods[] = { - {"b85encode", b85encode, METH_VARARGS, - "Encode text in base85.\n\n" - "If the second parameter is true, pad the result to a multiple of " - "five characters.\n"}, - {"b85decode", b85decode, METH_VARARGS, "Decode base85 text.\n"}, - {NULL, NULL} + {"b85encode", b85encode, METH_VARARGS, + "Encode text in base85.\n\n" + "If the second parameter is true, pad the result to a multiple of " + "five characters.\n"}, + {"b85decode", b85decode, METH_VARARGS, "Decode base85 text.\n"}, + {NULL, NULL}, }; static const int version = 1; #ifdef IS_PY3K static struct PyModuleDef base85_module = { - PyModuleDef_HEAD_INIT, - "base85", - base85_doc, - -1, - methods + PyModuleDef_HEAD_INIT, "base85", base85_doc, -1, methods, }; PyMODINIT_FUNC PyInit_base85(void)