At file:///home/pqm/archives/thelove/bzr/%2Btrunk/ ------------------------------------------------------------ revno: 5038 [merge] revision-id: [email protected] parent: [email protected] parent: [email protected] committer: Canonical.com Patch Queue Manager <[email protected]> branch nick: +trunk timestamp: Wed 2010-02-17 07:46:11 +0000 message: (mbp) Don't show pointer in safe_string_from_size error modified: bzrlib/_dirstate_helpers_pyx.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3 === modified file 'bzrlib/_dirstate_helpers_pyx.pyx' --- a/bzrlib/_dirstate_helpers_pyx.pyx 2010-01-05 07:22:59 +0000 +++ b/bzrlib/_dirstate_helpers_pyx.pyx 2010-02-17 06:25:37 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2007, 2008 Canonical Ltd +# Copyright (C) 2007, 2008, 2010 Canonical Ltd # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -156,12 +156,12 @@ return None return <char*>found - <char*>_s + cdef object safe_string_from_size(char *s, Py_ssize_t size): if size < 0: - # XXX: On 64-bit machines the <int> cast causes a C compiler warning. raise AssertionError( - 'tried to create a string with an invalid size: %d @0x%x' - % (size, <int>s)) + 'tried to create a string with an invalid size: %d' + % (size)) return PyString_FromStringAndSize(s, size)
-- bazaar-commits mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
