qiurui
/
qtconnectivity
mirror of https://github.com/qt/qtconnectivity.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Port to std::snprintf() and mark the module qsnprintf()-clean 

Task-number: QTBUG-127110
Change-Id: I5cbe79c3f5a95ba4ccbab5e2056e2a061f93d448
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit e707e33e14)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2024-07-18 16:09:28 +02:00 committed by Qt Cherry-pick Bot
parent 39e673bbb6
commit 0101120f81
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cmake.conf
View File

@ -2,3 +2,4 @@ set(QT_REPO_MODULE_VERSION "6.8.0")
set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1")
list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1")
list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_QSNPRINTF=1")

24
src/tools/sdpscanner/main.cpp
View File

@ -10,6 +10,8 @@
#include <bluetooth/sdp.h> #include <bluetooth/sdp.h>
#include <bluetooth/sdp_lib.h> #include <bluetooth/sdp_lib.h>
#include <cstdio>
#define RETURN_SUCCESS 0 #define RETURN_SUCCESS 0
#define RETURN_USAGE 1 #define RETURN_USAGE 1
#define RETURN_INVALPARAM 2 #define RETURN_INVALPARAM 2
@ -48,50 +50,50 @@ static void parseAttributeValues(sdp_data_t *data, int indentation, QByteArray &
xmlOutput.append("<nil/>\n"); xmlOutput.append("<nil/>\n");
break; break;
case SDP_UINT8: case SDP_UINT8:
qsnprintf(snBuffer, BUFFER_SIZE, "<uint8 value=\"0x%02x\"/>\n", data->val.uint8); std::snprintf(snBuffer, BUFFER_SIZE, "<uint8 value=\"0x%02x\"/>\n", data->val.uint8);
xmlOutput.append(snBuffer); xmlOutput.append(snBuffer);
break; break;
case SDP_UINT16: case SDP_UINT16:
qsnprintf(snBuffer, BUFFER_SIZE, "<uint16 value=\"0x%04x\"/>\n", data->val.uint16); std::snprintf(snBuffer, BUFFER_SIZE, "<uint16 value=\"0x%04x\"/>\n", data->val.uint16);
xmlOutput.append(snBuffer); xmlOutput.append(snBuffer);
break; break;
case SDP_UINT32: case SDP_UINT32:
qsnprintf(snBuffer, BUFFER_SIZE, "<uint32 value=\"0x%08x\"/>\n", data->val.uint32); std::snprintf(snBuffer, BUFFER_SIZE, "<uint32 value=\"0x%08x\"/>\n", data->val.uint32);
xmlOutput.append(snBuffer); xmlOutput.append(snBuffer);
break; break;
case SDP_UINT64: case SDP_UINT64:
qsnprintf(snBuffer, BUFFER_SIZE, "<uint64 value=\"0x%016llx\"/>\n", std::snprintf(snBuffer, BUFFER_SIZE, "<uint64 value=\"0x%016llx\"/>\n",
qulonglong(data->val.uint64)); qulonglong(data->val.uint64));
xmlOutput.append(snBuffer); xmlOutput.append(snBuffer);
break; break;
case SDP_UINT128: case SDP_UINT128:
xmlOutput.append("<uint128 value=\"0x"); xmlOutput.append("<uint128 value=\"0x");
for (int i = 0; i < 16; i++) for (int i = 0; i < 16; i++)
::sprintf(&snBuffer[i * 2], "%02x", data->val.uint128.data[i]); std::sprintf(&snBuffer[i * 2], "%02x", data->val.uint128.data[i]);
xmlOutput.append(snBuffer); xmlOutput.append(snBuffer);
xmlOutput.append("\"/>\n"); xmlOutput.append("\"/>\n");
break; break;
case SDP_INT8: case SDP_INT8:
qsnprintf(snBuffer, BUFFER_SIZE, "<int8 value=\"%d\"/>/n", data->val.int8); std::snprintf(snBuffer, BUFFER_SIZE, "<int8 value=\"%d\"/>/n", data->val.int8);
xmlOutput.append(snBuffer); xmlOutput.append(snBuffer);
break; break;
case SDP_INT16: case SDP_INT16:
qsnprintf(snBuffer, BUFFER_SIZE, "<int16 value=\"%d\"/>/n", data->val.int16); std::snprintf(snBuffer, BUFFER_SIZE, "<int16 value=\"%d\"/>/n", data->val.int16);
xmlOutput.append(snBuffer); xmlOutput.append(snBuffer);
break; break;
case SDP_INT32: case SDP_INT32:
qsnprintf(snBuffer, BUFFER_SIZE, "<int32 value=\"%d\"/>/n", data->val.int32); std::snprintf(snBuffer, BUFFER_SIZE, "<int32 value=\"%d\"/>/n", data->val.int32);
xmlOutput.append(snBuffer); xmlOutput.append(snBuffer);
break; break;
case SDP_INT64: case SDP_INT64:
qsnprintf(snBuffer, BUFFER_SIZE, "<int64 value=\"%lld\"/>/n", std::snprintf(snBuffer, BUFFER_SIZE, "<int64 value=\"%lld\"/>/n",
qlonglong(data->val.int64)); qlonglong(data->val.int64));
xmlOutput.append(snBuffer); xmlOutput.append(snBuffer);
break; break;
case SDP_INT128: case SDP_INT128:
xmlOutput.append("<int128 value=\"0x"); xmlOutput.append("<int128 value=\"0x");
for (int i = 0; i < 16; i++) for (int i = 0; i < 16; i++)
::sprintf(&snBuffer[i * 2], "%02x", data->val.int128.data[i]); std::sprintf(&snBuffer[i * 2], "%02x", data->val.int128.data[i]);
xmlOutput.append(snBuffer); xmlOutput.append(snBuffer);
xmlOutput.append("\"/>\n"); xmlOutput.append("\"/>\n");
break; break;
@ -205,7 +207,7 @@ static void parseAttribute(void *value, void *extraData)
char buffer[BUFFER_SIZE]; char buffer[BUFFER_SIZE];
::qsnprintf(buffer, BUFFER_SIZE, " <attribute id=\"0x%04x\">\n", data->attrId); std::snprintf(buffer, BUFFER_SIZE, " <attribute id=\"0x%04x\">\n", data->attrId);
xmlOutput->append(buffer); xmlOutput->append(buffer);
parseAttributeValues(data, 2, *xmlOutput); parseAttributeValues(data, 2, *xmlOutput);