diff --git a/.cmake.conf b/.cmake.conf index 62cb061c..67f2ddcf 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -2,3 +2,4 @@ set(QT_REPO_MODULE_VERSION "6.8.0") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") 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_QSNPRINTF=1") diff --git a/src/tools/sdpscanner/main.cpp b/src/tools/sdpscanner/main.cpp index 03adb076..e41dc18a 100644 --- a/src/tools/sdpscanner/main.cpp +++ b/src/tools/sdpscanner/main.cpp @@ -10,6 +10,8 @@ #include #include +#include + #define RETURN_SUCCESS 0 #define RETURN_USAGE 1 #define RETURN_INVALPARAM 2 @@ -48,50 +50,50 @@ static void parseAttributeValues(sdp_data_t *data, int indentation, QByteArray & xmlOutput.append("\n"); break; case SDP_UINT8: - qsnprintf(snBuffer, BUFFER_SIZE, "\n", data->val.uint8); + std::snprintf(snBuffer, BUFFER_SIZE, "\n", data->val.uint8); xmlOutput.append(snBuffer); break; case SDP_UINT16: - qsnprintf(snBuffer, BUFFER_SIZE, "\n", data->val.uint16); + std::snprintf(snBuffer, BUFFER_SIZE, "\n", data->val.uint16); xmlOutput.append(snBuffer); break; case SDP_UINT32: - qsnprintf(snBuffer, BUFFER_SIZE, "\n", data->val.uint32); + std::snprintf(snBuffer, BUFFER_SIZE, "\n", data->val.uint32); xmlOutput.append(snBuffer); break; case SDP_UINT64: - qsnprintf(snBuffer, BUFFER_SIZE, "\n", + std::snprintf(snBuffer, BUFFER_SIZE, "\n", qulonglong(data->val.uint64)); xmlOutput.append(snBuffer); break; case SDP_UINT128: xmlOutput.append("val.uint128.data[i]); + std::sprintf(&snBuffer[i * 2], "%02x", data->val.uint128.data[i]); xmlOutput.append(snBuffer); xmlOutput.append("\"/>\n"); break; case SDP_INT8: - qsnprintf(snBuffer, BUFFER_SIZE, "/n", data->val.int8); + std::snprintf(snBuffer, BUFFER_SIZE, "/n", data->val.int8); xmlOutput.append(snBuffer); break; case SDP_INT16: - qsnprintf(snBuffer, BUFFER_SIZE, "/n", data->val.int16); + std::snprintf(snBuffer, BUFFER_SIZE, "/n", data->val.int16); xmlOutput.append(snBuffer); break; case SDP_INT32: - qsnprintf(snBuffer, BUFFER_SIZE, "/n", data->val.int32); + std::snprintf(snBuffer, BUFFER_SIZE, "/n", data->val.int32); xmlOutput.append(snBuffer); break; case SDP_INT64: - qsnprintf(snBuffer, BUFFER_SIZE, "/n", + std::snprintf(snBuffer, BUFFER_SIZE, "/n", qlonglong(data->val.int64)); xmlOutput.append(snBuffer); break; case SDP_INT128: xmlOutput.append("val.int128.data[i]); + std::sprintf(&snBuffer[i * 2], "%02x", data->val.int128.data[i]); xmlOutput.append(snBuffer); xmlOutput.append("\"/>\n"); break; @@ -205,7 +207,7 @@ static void parseAttribute(void *value, void *extraData) char buffer[BUFFER_SIZE]; - ::qsnprintf(buffer, BUFFER_SIZE, " \n", data->attrId); + std::snprintf(buffer, BUFFER_SIZE, " \n", data->attrId); xmlOutput->append(buffer); parseAttributeValues(data, 2, *xmlOutput);