Ticket #293: printfwarnings.patch

File printfwarnings.patch, 12.1 KB (added by Quentin Pradet, 15 years ago)

Corrected issues described above.

  • source/ps/ConfigDB.cpp

     
    284284            LibError ret = g_VFS->LoadFile(m_ConfigFile[ns], buffer, buflen);
    285285            if (ret != INFO::OK)
    286286            {
    287                 LOG(CLogger::Error, LOG_CATEGORY, "vfs_load for \"%s\" failed: return was %lld", m_ConfigFile[ns].c_str(), ret);
     287                LOG(CLogger::Error, LOG_CATEGORY, "vfs_load for \"%s\" failed: return was %ld", m_ConfigFile[ns].c_str(), ret);
    288288                return false;
    289289            }
    290290        }

  • source/ps/XML/XMLWriter.cpp

     
    8989    LibError ret = g_VFS->CreateFile(filename, data, size);
    9090    if (ret < 0)
    9191    {
    92         LOG(CLogger::Error, "xml", "Error saving XML data through VFS: %d", ret);
     92        LOG(CLogger::Error, "xml", "Error saving XML data through VFS: %ld", ret);
    9393        return false;
    9494    }
    9595    return true;

  • source/ps/Filesystem.cpp

     
    5757    LibError ret = g_VFS->LoadFile(filename, m_Buffer, m_BufferSize);
    5858    if (ret != INFO::OK)
    5959    {
    60         LOG(CLogger::Error, LOG_CATEGORY, "CVFSFile: file %s couldn't be opened (vfs_load: %d)", filename.string().c_str(), ret);
     60        LOG(CLogger::Error, LOG_CATEGORY, "CVFSFile: file %s couldn't be opened (vfs_load: %ld)", filename.string().c_str(), ret);
    6161        return PSRETURN_CVFSFile_LoadFailed;
    6262    }
    6363

  • source/ps/Interact.cpp

     
    982982    Handle tmp = ogl_tex_load(name.c_str());
    983983    if (tmp <= 0)
    984984    {
    985         LOG(CLogger::Error, LOG_CATEGORY, "Rank Textures", "loadRankTextures failed on \"%s\"", name.c_str());
     985        LOG(CLogger::Error, LOG_CATEGORY, "loadRankTextures failed on \"%s\"", name.c_str());
    986986        return INFO::CB_CONTINUE;
    987987    }
    988988    name.Remove("art/textures/ui/session/icons/");  //Names are relative to this directory

  • source/gui/CGUI.cpp

     
    11081108    }
    11091109    catch (PSERROR_GUI& e)
    11101110    {
    1111         LOG(CLogger::Error, LOG_CATEGORY, "Errors loading GUI file %s (%s)", Filename.c_str(), e.getCode());
     1111        LOG(CLogger::Error, LOG_CATEGORY, "Errors loading GUI file %s (%d)", Filename.c_str(), e.getCode());
    11121112        return;
    11131113    }
    11141114
    … …  
    13951395            // Try making the object read the tag.
    13961396            if (!object->HandleAdditionalChildren(child, pFile))
    13971397            {
    1398                 LOG(CLogger::Error, LOG_CATEGORY, "(object: %s) Reading unknown children for its type");
     1398                LOG(CLogger::Error, LOG_CATEGORY, "(object: %s) Reading unknown children for its type", object->GetPresentableName().c_str());
    13991399            }
    14001400        }
    14011401    }

  • source/simulation/Technology.cpp

     
    297297                JSFunction* fn = JS_ValueToFunction( g_ScriptingHost.GetContext(), fnval );
    298298                if( !fn )
    299299                {
    300                     LOG(CLogger::Error, LOG_CATEGORY, "CTechnology::LoadXml: Function does not exist for %hs in file %s. Load failed.", funcName.c_str(), filename.c_str() );
     300                    LOG(CLogger::Error, LOG_CATEGORY, "CTechnology::LoadXml: Function does not exist for %s in file %s. Load failed.", CStr(funcName).c_str(), filename.c_str() );
    301301                    return false;
    302302                }
    303303                m_effectFunction.SetFunction( fn );

  • source/simulation/EntityTemplate.cpp

     
    317317                        JSFunction* fn = JS_ValueToFunction( g_ScriptingHost.GetContext(), fnval );
    318318                        if( !fn )
    319319                        {
    320                             LOG(CLogger::Error, LOG_CATEGORY, "CEntityTemplate::LoadXml: Function does not exist for event %hs in file %s. Load failed.", EventName.c_str(), filename.c_str() );
     320                            LOG(CLogger::Error, LOG_CATEGORY, "CEntityTemplate::LoadXml: Function does not exist for event %ls in file %s. Load failed.", EventName.c_str(), filename.c_str() );
    321321                            break;
    322322                        }
    323323                        m_EventHandlers[eventID].SetFunction( fn );

  • source/network/NetSession.cpp

     
    394394                // Is this our session?
    395395                if ( it->pPeer == event.peer )
    396396                {
    397                     NET_LOG2( "%x disconnected", event.peer->data );
     397                    NET_LOG2( "%p disconnected", event.peer->data );
    398398
    399399                    // Successfully handled?
    400400                    if ( !HandleDisconnect( it->pSession ) ) return false;
    … …  
    420420                    CNetMessage* pNewMessage = CNetMessageFactory::CreateMessage( event.packet->data, event.packet->dataLength );
    421421                    if ( !pNewMessage ) return false;
    422422
    423                     NET_LOG4( "Message %s of size %u was received from %x", pNewMessage->ToString().c_str(), pNewMessage->GetSerializedLength(), event.peer->data );
     423                    NET_LOG4( "Message %s of size %u was received from %p", pNewMessage->ToString().c_str(), pNewMessage->GetSerializedLength(), event.peer->data );
    424424
    425425                    // Successfully handled?
    426426                    if ( !HandleMessageReceive( pNewMessage, it->pSession ) ) {
    … …  
    526526    }
    527527    else
    528528    {
    529         NET_LOG4( "Message %s of size %u was sent to %x",
     529        NET_LOG4( "Message %s of size %u was sent to %p",
    530530            pMessage->ToString().c_str(), pMessage->GetSerializedLength(), pSession->m_Peer->data );
    531531    }
    532532

  • source/scripting/ScriptGlue.cpp

     
    10651065    switch(mode)
    10661066    {
    10671067    case -1:
    1068         sprintf_s(buf, ARRAY_SIZE(buf), "%s %s (%ws)", __DATE__, __TIME__, svn_revision);
     1068        sprintf_s(buf, ARRAY_SIZE(buf), "%s %s (%ls)", __DATE__, __TIME__, svn_revision);
    10691069        break;
    10701070    case 0:
    10711071        sprintf_s(buf, ARRAY_SIZE(buf), "%s", __DATE__);
    … …  
    10741074        sprintf_s(buf, ARRAY_SIZE(buf), "%s", __TIME__);
    10751075        break;
    10761076    case 2:
    1077         sprintf_s(buf, ARRAY_SIZE(buf), "%ws", svn_revision);
     1077        sprintf_s(buf, ARRAY_SIZE(buf), "%ls", svn_revision);
    10781078        break;
    10791079    }
    10801080
    … …  
    13761376        *rval = ToJSVal( g_TriggerManager.m_TriggerMap[name] );
    13771377    else
    13781378    {
    1379         debug_printf("Invalid trigger name %ws", name.c_str());
     1379        debug_printf("Invalid trigger name %ls", name.c_str());
    13801380        *rval = JSVAL_NULL;
    13811381    }
    13821382    return JS_TRUE;

  • source/lib/sysdep/os/unix/x/x.cpp

     
    169169            &len, &bytes_left,
    170170            &data);
    171171        if (result != Success)
    172             debug_printf("clipboard_get: result: %d type:%d len:%d format:%d bytes_left:%d\n",
    173                 result, (int)type, len, format, bytes_left);
     172            debug_printf("clipboard_get: result: %d type:%lu len:%lu format:%d bytes_left:%lu\n",
     173                result, type, len, format, bytes_left);
    174174        if (result == Success && bytes_left > 0)
    175175        {
    176176            result = XGetWindowProperty (disp, selOwner,
    … …  
    181181            if (result == Success)
    182182            {
    183183                debug_printf("clipboard_get: XGetWindowProperty succeeded, returning data\n");
    184                 debug_printf("clipboard_get: data was: \"%s\", type was %d, XA_STRING atom is %d\n", data, type, XA_STRING);
     184                debug_printf("clipboard_get: data was: \"%s\", type was %lu, XA_STRING atom is %lu\n", data, type, XA_STRING);
    185185               
    186186                if (type == XA_STRING) //Latin-1: Just copy into low byte of wchar_t
    187187                {

  • source/lib/tests/test_secure_crt.h

     
    6060#else
    6161class SuppressErrors
    6262{
     63    SuppressErrors()
     64    {
     65    }
    6366};
    6467#endif
    6568

  • source/lib/ogl.cpp

     
    273273    E(GL_STACK_UNDERFLOW)
    274274    E(GL_OUT_OF_MEMORY)
    275275    E(GL_INVALID_FRAMEBUFFER_OPERATION_EXT)
    276     default: debug_printf("GL error: %04f\n", err); break;
     276    default: debug_printf("Unknown GL error: %04x\n", err); break;
    277277    }
    278278#undef E
    279279}

  • source/lib/res/graphics/ogl_shader.cpp

     
    151151       
    152152        pglGetShaderInfoLog(shdr->id, log_length, 0, infolog);
    153153   
    154         debug_printf("Compile log for shader %hs (type %hs):\n%hs",
     154        debug_printf("Compile log for shader %s (type %s):\n%s",
    155155                pathname.string().c_str(),
    156156                shader_type_to_string(shdr->type, typenamebuf, ARRAY_SIZE(typenamebuf)),
    157157                infolog);
    … …  
    168168        ogl_WarnIfError();
    169169   
    170170        char typenamebuf[32];
    171         debug_printf("Failed to compile shader %hs (type %hs)\n",
     171        debug_printf("Failed to compile shader %s (type %s)\n",
    172172                 pathname.string().c_str(),
    173173                 shader_type_to_string(shdr->type, typenamebuf, ARRAY_SIZE(typenamebuf)));
    174174       
    … …  
    276276
    277277    if (Type.empty())
    278278    {
    279         LOG(CLogger::Error, LOG_CATEGORY, "%hs: Missing attribute \"type\" in element \"Shader\".", pathname.string().c_str());
     279        LOG(CLogger::Error, LOG_CATEGORY, "%s: Missing attribute \"type\" in element \"Shader\".", pathname.string().c_str());
    280280        WARN_RETURN(ERR::CORRUPTED);
    281281    }
    282282
    … …  
    284284   
    285285    if (!shadertype)
    286286    {
    287         LOG(CLogger::Error, LOG_CATEGORY, "%hs: Unknown shader type \"%hs\" (valid are: VERTEX_SHADER, FRAGMENT_SHADER).", pathname.string().c_str(), Type.c_str());
     287        LOG(CLogger::Error, LOG_CATEGORY, "%s: Unknown shader type \"%s\" (valid are: VERTEX_SHADER, FRAGMENT_SHADER).", pathname.string().c_str(), Type.c_str());
    288288        WARN_RETURN(ERR::CORRUPTED);
    289289    }
    290290
    … …  
    292292   
    293293    if (Name.empty())
    294294    {
    295         LOG(CLogger::Error, LOG_CATEGORY, "%hs: Missing shader name.", pathname.string().c_str());
     295        LOG(CLogger::Error, LOG_CATEGORY, "%s: Missing shader name.", pathname.string().c_str());
    296296        WARN_RETURN(ERR::CORRUPTED);
    297297    }
    298298   
    … …  
    345345
    346346    if (Root.GetNodeName() != el_program)
    347347    {
    348         LOG(CLogger::Error, LOG_CATEGORY, "%hs: XML root was not \"Program\".", pathname);
     348        LOG(CLogger::Error, LOG_CATEGORY, "%s: XML root was not \"Program\".", pathname);
    349349        WARN_RETURN(ERR::CORRUPTED);
    350350    }
    351351
    … …  
    366366               
    367367                if (Shader.GetNodeName() != el_shader)
    368368                {
    369                     LOG(CLogger::Error, LOG_CATEGORY, "%hs: Only \"Shader\" may be child of \"Shaders\".", pathname);
     369                    LOG(CLogger::Error, LOG_CATEGORY, "%s: Only \"Shader\" may be child of \"Shaders\".", pathname);
    370370                    WARN_RETURN(ERR::CORRUPTED);
    371371                }
    372372               
    … …  
    375375        }
    376376        else
    377377        {
    378             LOG(CLogger::Warning, LOG_CATEGORY, "%hs: Unknown child of \"Program\".", pathname);
     378            LOG(CLogger::Warning, LOG_CATEGORY, "%s: Unknown child of \"Program\".", pathname);
    379379        }
    380380    }
    381381
    … …  
    391391        char* infolog = new char[log_length];
    392392        pglGetProgramInfoLog(p->id, log_length, 0, infolog);
    393393
    394         debug_printf("Linker log for %hs:\n%hs\n", pathname, infolog);
     394        debug_printf("Linker log for %s:\n%s\n", pathname, infolog);
    395395        delete[] infolog;
    396396    }
    397397
    398398    if (!linked)
    399399    {
    400         debug_printf("Link failed for %hs\n", pathname);
     400        debug_printf("Link failed for %s\n", pathname);
    401401        WARN_RETURN(ERR::SHDR_LINK);
    402402    }
    403403

  • source/renderer/Renderer.cpp

     
    710710    if (name == "default")
    711711        return RP_DEFAULT;
    712712
    713     LOG(CLogger::Warning, LOG_CATEGORY, "Unknown render path name '%hs', assuming 'default'", name.c_str());
     713    LOG(CLogger::Warning, LOG_CATEGORY, "Unknown render path name '%s', assuming 'default'", name.c_str());
    714714    return RP_DEFAULT;
    715715}
    716716