diff options
| author | Chia-I Wu <olv@lunarg.com> | 2014-12-16 10:47:33 +0800 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2014-12-17 11:01:45 +0800 |
| commit | ac71fb6316173400da6b71f00bfa312fa614d205 (patch) | |
| tree | 5f4a45f1c3cf929a9d3b1cc6c223eae32294a0f1 | |
| parent | e58076bff45e8a320638ac1746803f196322151c (diff) | |
| download | usermoji-ac71fb6316173400da6b71f00bfa312fa614d205.tar.xz | |
layers: fix -Wpointer-sign warnings
| -rw-r--r-- | layers/draw_state.c | 8 | ||||
| -rw-r--r-- | layers/mem_tracker.c | 10 | ||||
| -rwxr-xr-x | xgl-layer-generate.py | 12 |
3 files changed, 14 insertions, 16 deletions
diff --git a/layers/draw_state.c b/layers/draw_state.c index 7aac33bc..ce1e365a 100644 --- a/layers/draw_state.c +++ b/layers/draw_state.c @@ -46,13 +46,13 @@ static XGL_VOID layerCbMsg(XGL_DBG_MSG_TYPE msgType, XGL_BASE_OBJECT srcObject, XGL_SIZE location, XGL_INT msgCode, - const XGL_CHAR* pLayerPrefix, - const XGL_CHAR* pMsg) + const char* pLayerPrefix, + const char* pMsg) { XGL_LAYER_DBG_FUNCTION_NODE *pTrav = pDbgFunctionHead; if (pTrav) { while (pTrav) { - pTrav->pfnMsgCallback(msgType, validationLevel, srcObject, location, msgCode, pMsg, pTrav->pUserData); + pTrav->pfnMsgCallback(msgType, validationLevel, srcObject, location, msgCode, (const XGL_CHAR *) pMsg, pTrav->pUserData); pTrav = pTrav->pNext; } } @@ -1184,7 +1184,7 @@ XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglEnumerateLayers(XGL_PHYSICAL_GPU gpu, XGL_ return XGL_ERROR_INVALID_POINTER; // This layer compatible with all GPUs *pOutLayerCount = 1; - strncpy(pOutLayers[0], "DrawState", maxStringSize); + strncpy((char *) pOutLayers[0], "DrawState", maxStringSize); return XGL_SUCCESS; } } diff --git a/layers/mem_tracker.c b/layers/mem_tracker.c index 8007f5d7..fd79e6a5 100644 --- a/layers/mem_tracker.c +++ b/layers/mem_tracker.c @@ -1,5 +1,3 @@ -/* THIS FILE IS GENERATED. DO NOT EDIT. */ - /* * XGL * @@ -44,13 +42,13 @@ static XGL_VOID layerCbMsg(XGL_DBG_MSG_TYPE msgType, XGL_BASE_OBJECT srcObject, XGL_SIZE location, XGL_INT msgCode, - const XGL_CHAR* pLayerPrefix, - const XGL_CHAR* pMsg) + const char* pLayerPrefix, + const char* pMsg) { XGL_LAYER_DBG_FUNCTION_NODE *pTrav = pDbgFunctionHead; if (pTrav) { while (pTrav) { - pTrav->pfnMsgCallback(msgType, validationLevel, srcObject, location, msgCode, pMsg, pTrav->pUserData); + pTrav->pfnMsgCallback(msgType, validationLevel, srcObject, location, msgCode, (const XGL_CHAR *) pMsg, pTrav->pUserData); pTrav = pTrav->pNext; } } @@ -1116,7 +1114,7 @@ XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglEnumerateLayers(XGL_PHYSICAL_GPU gpu, XGL_ return XGL_ERROR_INVALID_POINTER; // This layer compatible with all GPUs *pOutLayerCount = 1; - strncpy(pOutLayers[0], "MemTracker", maxStringSize); + strncpy((char *) pOutLayers[0], "MemTracker", maxStringSize); return XGL_SUCCESS; } } diff --git a/xgl-layer-generate.py b/xgl-layer-generate.py index ebb414ac..21e10cf0 100755 --- a/xgl-layer-generate.py +++ b/xgl-layer-generate.py @@ -160,7 +160,7 @@ class Subcommand(object): ' return XGL_ERROR_INVALID_POINTER;\n' ' // This layer compatible with all GPUs\n' ' *pOutLayerCount = 1;\n' - ' strncpy(pOutLayers[0], "%s", maxStringSize);\n' + ' strncpy((char *) pOutLayers[0], "%s", maxStringSize);\n' ' return XGL_SUCCESS;\n' ' }\n' '}' % (qual, decl, proto.params[0].name, proto.name, ret_val, c_call, proto.name, stmt, layer_name)) @@ -271,7 +271,7 @@ class Subcommand(object): ' return XGL_ERROR_INVALID_POINTER;\n' ' // This layer compatible with all GPUs\n' ' *pOutLayerCount = 1;\n' - ' strncpy(pOutLayers[0], "%s", maxStringSize);\n' + ' strncpy((char *) pOutLayers[0], "%s", maxStringSize);\n' ' return XGL_SUCCESS;\n' ' }\n' '}' % (qual, decl, proto.params[0].name, ret_val, c_call,f_open, log_func, f_close, stmt, layer_name)) @@ -377,7 +377,7 @@ class Subcommand(object): ' return XGL_ERROR_INVALID_POINTER;\n' ' // This layer compatible with all GPUs\n' ' *pOutLayerCount = 1;\n' - ' strncpy(pOutLayers[0], "%s", maxStringSize);\n' + ' strncpy((char *) pOutLayers[0], "%s", maxStringSize);\n' ' return XGL_SUCCESS;\n' ' }\n' '}' % (qual, decl, proto.params[0].name, using_line, ret_val, c_call, create_line, destroy_line, stmt, layer_name)) @@ -1713,13 +1713,13 @@ class ObjectTrackerSubcommand(Subcommand): header_txt.append(' XGL_BASE_OBJECT srcObject,') header_txt.append(' XGL_SIZE location,') header_txt.append(' XGL_INT msgCode,') - header_txt.append(' const XGL_CHAR* pLayerPrefix,') - header_txt.append(' const XGL_CHAR* pMsg)') + header_txt.append(' const char* pLayerPrefix,') + header_txt.append(' const char* pMsg)') header_txt.append('{') header_txt.append(' XGL_LAYER_DBG_FUNCTION_NODE *pTrav = pDbgFunctionHead;') header_txt.append(' if (pTrav) {') header_txt.append(' while (pTrav) {') - header_txt.append(' pTrav->pfnMsgCallback(msgType, validationLevel, srcObject, location, msgCode, pMsg, pTrav->pUserData);') + header_txt.append(' pTrav->pfnMsgCallback(msgType, validationLevel, srcObject, location, msgCode, (const XGL_CHAR *) pMsg, pTrav->pUserData);') header_txt.append(' pTrav = pTrav->pNext;') header_txt.append(' }') header_txt.append(' }') |