mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cast loses precision

Browse Source 
Change-Id: Ic688f08cada4ae70ea1dfb1e29e249a166456452
This commit is contained in:
Caolán McNamara 2014-06-12 14:28:17 +01:00
parent 4348dfbd4a
commit 18c786cbcd
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/LibreOfficeKit/LibreOfficeKit.h
View File

@ -20,14 +20,14 @@ typedef struct _LibreOfficeKitDocument LibreOfficeKitDocument;
// Do we have an extended member in this struct ? // Do we have an extended member in this struct ?
#define LIBREOFFICEKIT_HAS_MEMBER(strct,member,nSize) \ #define LIBREOFFICEKIT_HAS_MEMBER(strct,member,nSize) \
((((int)((unsigned char *)&((strct *) 0)->member) + \ ((((size_t)((unsigned char *)&((strct *) 0)->member) + \
(int)sizeof ((strct *) 0)->member)) <= (nSize)) sizeof ((strct *) 0)->member)) <= (nSize))
#define LIBREOFFICEKIT_HAS(pKit,member) LIBREOFFICEKIT_HAS_MEMBER(LibreOfficeKit,member,(pKit)->nSize) #define LIBREOFFICEKIT_HAS(pKit,member) LIBREOFFICEKIT_HAS_MEMBER(LibreOfficeKit,member,(pKit)->nSize)
struct _LibreOfficeKit struct _LibreOfficeKit
{ {
int nSize; size_t nSize;
void (*destroy) (LibreOfficeKit *pThis); void (*destroy) (LibreOfficeKit *pThis);
int (*initialize) (LibreOfficeKit *pThis, const char *pInstallPath); int (*initialize) (LibreOfficeKit *pThis, const char *pInstallPath);
@ -39,7 +39,7 @@ struct _LibreOfficeKit
struct _LibreOfficeKitDocument struct _LibreOfficeKitDocument
{ {
int nSize; size_t nSize;
void (*destroy) (LibreOfficeKitDocument* pThis); void (*destroy) (LibreOfficeKitDocument* pThis);
int (*saveAs) (LibreOfficeKitDocument* pThis, int (*saveAs) (LibreOfficeKitDocument* pThis,

7
smoketest/libtest.cxx
View File

@ -13,6 +13,7 @@
#include <assert.h> #include <assert.h>
#include <math.h> #include <math.h>
#include <sys/time.h> #include <sys/time.h>
#include <sal/types.h>
#include <LibreOfficeKit/LibreOfficeKit.hxx> #include <LibreOfficeKit/LibreOfficeKit.hxx>
using namespace ::lok; using namespace ::lok;
@ -77,9 +78,9 @@ int main (int argc, char **argv)
if (!LIBREOFFICEKIT_DOCUMENT_HAS(pDocument->get(), saveAsWithOptions)) if (!LIBREOFFICEKIT_DOCUMENT_HAS(pDocument->get(), saveAsWithOptions))
{ {
fprintf( stderr, "using obsolete LibreOffice %d + %d vs. %d\n", fprintf( stderr, "using obsolete LibreOffice %" SAL_PRI_SIZET "d + %" SAL_PRI_SIZET "d vs. %" SAL_PRI_SIZET "d\n",
(int)((unsigned char *)&((LibreOfficeKitDocument *) 0)->saveAsWithOptions), (size_t)((unsigned char *)&((LibreOfficeKitDocument *) 0)->saveAsWithOptions),
(int)sizeof ((LibreOfficeKitDocument *) 0)->saveAsWithOptions, sizeof ((LibreOfficeKitDocument *) 0)->saveAsWithOptions,
pDocument->get()->nSize ); pDocument->get()->nSize );
return -1; return -1;
} }