[Python-checkins] cpython (merge default -> default): null merge

[matthias.klose]

http://hg.python.org/cpython/rev/6534a061ecfd
changeset:   77890:6534a061ecfd
parent:      77889:0f4782ebe89e
parent:      77887:08ccb656ec93
user:        doko at ubuntu.com
date:        Sat Jun 30 22:36:12 2012 +0200
summary:
  null merge

files:
  Modules/_decimal/libmpdec/mpdecimal.c |  8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Modules/_decimal/libmpdec/mpdecimal.c b/Modules/_decimal/libmpdec/mpdecimal.c
--- a/Modules/_decimal/libmpdec/mpdecimal.c
+++ b/Modules/_decimal/libmpdec/mpdecimal.c
@@ -7707,7 +7707,7 @@
             wlen = n+1;
         }
         (*w)[n++] = (uint32_t)_mpd_shortdiv_b(u, u, ulen, wbase, ubase);
-        /* ulen will be at least 1. u[ulen-1] can only be zero if ulen == 1 */
+        /* ulen is at least 1. u[ulen-1] can only be zero if ulen == 1. */
         ulen = _mpd_real_size(u, ulen);
 
     } while (u[ulen-1] != 0);
@@ -8041,7 +8041,7 @@
         usrc[n] = srcdata[n];
     }
 
-    if (!mpd_qresize_zero(result, rlen, status)) {
+    if (!mpd_qresize(result, rlen, status)) {
         goto finish;
     }
 
@@ -8084,7 +8084,7 @@
         return;
     }
 
-    if (!mpd_qresize_zero(result, rlen, status)) {
+    if (!mpd_qresize(result, rlen, status)) {
         return;
     }
 
@@ -8094,7 +8094,7 @@
                                  status);
 #else
     if (srcbase == MPD_RADIX) {
-        if (!mpd_qresize_zero(result, srclen, status)) {
+        if (!mpd_qresize(result, srclen, status)) {
             return;
         }
         memcpy(result->data, srcdata, srclen * (sizeof *srcdata));

-- 
Repository URL: http://hg.python.org/cpython