1 files changed, 12 insertions, 15 deletions

diff --git a/src/corelib/tools/qvsnprintf.cpp b/src/corelib/tools/qvsnprintf.cpp
index be92e20fac..6f18d21d2b 100644
--- a/src/corelib/tools/qvsnprintf.cpp
+++ b/src/corelib/tools/qvsnprintf.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
@@ -10,9 +10,9 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
 ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** $QT_END_LICENSE$
@@ -58,10 +58,10 @@ QT_BEGIN_NAMESPACE
     platforms, you should not rely on the return value or on the fact
     that you will always get a 0 terminated string back.
 
-    Ideally, you should never call this function but use QString::sprintf()
+    Ideally, you should never call this function but use QString::asprintf()
     instead.
 
-    \sa qsnprintf(), QString::sprintf()
+    \sa qsnprintf(), QString::asprintf()
 */
 
 int qvsnprintf(char *str, size_t n, const char *fmt, va_list ap)
@@ -69,10 +69,7 @@ int qvsnprintf(char *str, size_t n, const char *fmt, va_list ap)
     if (!str || !fmt)
         return -1;
 
-    QString buf;
-    buf.vsprintf(fmt, ap);
-
-    QByteArray ba = buf.toLocal8Bit();
+    const QByteArray ba = QString::vasprintf(fmt, ap).toLocal8Bit();
 
     if (n > 0) {
         size_t blen = qMin(size_t(ba.length()), size_t(n - 1));
@@ -107,9 +104,9 @@ int qvsnprintf(char *str, size_t n, const char *fmt, va_list ap)
 
     \warning Call this function only when you know what you are doing
     since it shows different behavior on certain platforms.
-    Use QString::sprintf() to format a string instead.
+    Use QString::asprintf() to format a string instead.
 
-    \sa qvsnprintf(), QString::sprintf()
+    \sa qvsnprintf(), QString::asprintf()
 */
 
 int qsnprintf(char *str, size_t n, const char *fmt, ...)