[Libreoffice-commits] .: 8 commits - clucene/CustomTarget_source.mk clucene/patches connectivity/source idlc/source odk/source testtools/source
Stephan Bergmann
sbergmann at kemper.freedesktop.org
Mon Apr 23 05:20:05 PDT 2012
clucene/CustomTarget_source.mk | 1
clucene/patches/clucene-multimap-put.patch | 9 +++++++
connectivity/source/drivers/jdbc/Array.cxx | 4 +--
connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx | 6 ++---
connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx | 12 +++++-----
connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx | 12 +++++-----
idlc/source/scanner.ll | 3 +-
odk/source/unoapploader/unx/unoapploader.c | 6 +++--
testtools/source/bridgetest/makefile.mk | 4 +++
9 files changed, 37 insertions(+), 20 deletions(-)
New commits:
commit 85c2f280ef21780de8aa2aa3c35148afc38f70b7
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 23 14:18:24 2012 +0200
Revert "i hope this is fixed now"
This reverts commit b8044cb828af149a4598b35a4d46d8fe4205ae74.
84dbc4fe2547f8fc341a46d7f000e721c81e63ee fixed the bridge for PPC on Linux, not
Mac OS X.
diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk
index f87327e..3e31ba6 100644
--- a/testtools/source/bridgetest/makefile.mk
+++ b/testtools/source/bridgetest/makefile.mk
@@ -146,11 +146,15 @@ ALLTAR: \
runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk \
$(SHL1TARGETN) $(SHL2TARGETN) $(SHL3TARGETN)
.IF "$(CROSS_COMPILING)"!="YES"
+.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP"
+ @echo "Mac OSX PPC GCC fails this test!, likely broken UNO bridge. Fix me."
+.ELSE
cd $(DLLDEST) && $(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/uno \
-ro uno_services.rdb -ro uno_types.rdb \
-s com.sun.star.test.bridge.BridgeTest -- \
com.sun.star.test.bridge.CppTestObject
.ENDIF
+.ENDIF
$(DLLDEST)/services.rdb :
$(COPY) $(SOLARXMLDIR)/ure/services.rdb $@
commit 40813789450f4e7aa506a191a2d1360c2b077d89
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 23 14:15:42 2012 +0200
Minor improvement of previous fix
diff --git a/odk/source/unoapploader/unx/unoapploader.c b/odk/source/unoapploader/unx/unoapploader.c
index 087f086..90c1cd1 100644
--- a/odk/source/unoapploader/unx/unoapploader.c
+++ b/odk/source/unoapploader/unx/unoapploader.c
@@ -100,7 +100,7 @@ int main( int argc, char *argv[] )
struct stat stat;
int ret;
- char unoinfoSuffix[] = "/unoinfo";
+ static char const unoinfoSuffix[] = "/unoinfo";
char * unoinfo = malloc(
pathlen + RTL_CONSTASCII_LENGTH(unoinfoSuffix) + 1);
/*TODO: overflow */
commit 5b3d15241feb47e914c6835664a90c346d69411d
Author: Catalin Iacob <iacobcatalin at gmail.com>
Date: Thu Apr 19 21:16:59 2012 +0200
WaE: Clang implicit conversion changes signedness
The various *Card* members call getByIndex(rowIndex) and getByIndex expects
sal_uInt32 so change everything to it. Change callers as well to adapt to
the change.
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
index a4cc600..c3d151e 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
@@ -179,19 +179,19 @@ nsresult MNSMozabProxy::QueryHelperStub()
case ProxiedFunc::FUNC_QUERYHELPER_DELETE_CARD:
if (m_Args->arg2 && m_Args->arg3 ) //m_Args->arg2 used to get the cord number
{
- rv = mHelper->deleteCard(*((sal_Int32*)m_Args->arg2),(nsIAbDirectory*)m_Args->arg3);
+ rv = mHelper->deleteCard(*((sal_uInt32*)m_Args->arg2),(nsIAbDirectory*)m_Args->arg3);
}
break;
case ProxiedFunc::FUNC_QUERYHELPER_COMMIT_CARD:
if (m_Args->arg2 && m_Args->arg3 ) //m_Args->arg2 used to get the cord number
{
- rv = mHelper->commitCard(*((sal_Int32*)m_Args->arg2),(nsIAbDirectory*)m_Args->arg3);
+ rv = mHelper->commitCard(*((sal_uInt32*)m_Args->arg2),(nsIAbDirectory*)m_Args->arg3);
}
break;
case ProxiedFunc::FUNC_QUERYHELPER_RESYNC_CARD:
if (m_Args->arg2) //m_Args->arg2 used to get the cord number
{
- rv = mHelper->resyncRow(*((sal_Int32*)m_Args->arg2));
+ rv = mHelper->resyncRow(*((sal_uInt32*)m_Args->arg2));
}
break;
default:
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
index 2c51dc9..6e9079c 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
@@ -470,7 +470,7 @@ nsIAbCard * getUpdatedCard( nsIAbCard* card)
return sal_False; \
}
-sal_Int32 MQueryHelper::commitCard(const sal_Int32 rowIndex,nsIAbDirectory * directory)
+sal_Int32 MQueryHelper::commitCard(const sal_uInt32 rowIndex,nsIAbDirectory * directory)
{
ENSURE_MOZAB_PROFILE_NOT_LOOKED(directory);
@@ -508,7 +508,7 @@ sal_Int32 MQueryHelper::commitCard(const sal_Int32 rowIndex,nsIAbDirectory * dir
return !(NS_FAILED(rv));
}
-sal_Int32 MQueryHelper::deleteCard(const sal_Int32 rowIndex,nsIAbDirectory * directory)
+sal_Int32 MQueryHelper::deleteCard(const sal_uInt32 rowIndex,nsIAbDirectory * directory)
{
ENSURE_MOZAB_PROFILE_NOT_LOOKED(directory);
MQueryHelperResultEntry *resEntry = getByIndex(rowIndex);
@@ -555,7 +555,7 @@ sal_Int32 MQueryHelper::deleteCard(const sal_Int32 rowIndex,nsIAbDirectory * dir
return !(NS_FAILED(rv));
}
-sal_Bool MQueryHelper::setCardValues(const sal_Int32 rowIndex)
+sal_Bool MQueryHelper::setCardValues(const sal_uInt32 rowIndex)
{
MQueryHelperResultEntry *resEntry = getByIndex(rowIndex);
if (!resEntry)
@@ -574,7 +574,7 @@ sal_Bool MQueryHelper::setCardValues(const sal_Int32 rowIndex)
return sal_True;
}
-void MQueryHelper::getCardValues(nsIAbCard *card,sal_Int32 rowIndex)
+void MQueryHelper::getCardValues(nsIAbCard *card,sal_uInt32 rowIndex)
{
MQueryHelperResultEntry *resEntry;
if (rowIndex>0)
@@ -589,7 +589,7 @@ void MQueryHelper::getCardValues(nsIAbCard *card,sal_Int32 rowIndex)
if (!rowIndex)
append( resEntry );
}
-sal_Bool MQueryHelper::resyncRow(sal_Int32 rowIndex)
+sal_Bool MQueryHelper::resyncRow(sal_uInt32 rowIndex)
{
MQueryHelperResultEntry *resEntry = getByIndex(rowIndex);
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
index 741f935..948f600 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
@@ -90,7 +90,7 @@ namespace connectivity
void clearResultOrComplete();
void notifyResultOrComplete();
sal_Bool waitForResultOrComplete( );
- void getCardValues(nsIAbCard *card,sal_Int32 rowIndex=0);
+ void getCardValues(nsIAbCard *card,sal_uInt32 rowIndex=0);
#if OSL_DEBUG_LEVEL > 0
oslThreadIdentifier m_oThreadID;
#endif
@@ -120,12 +120,12 @@ namespace connectivity
sal_Int32 getResultCount() const;
sal_uInt32 getRealCount() const;
sal_Int32 createNewCard(); //return Row count number
- sal_Bool resyncRow(sal_Int32 rowIndex);
+ sal_Bool resyncRow(sal_uInt32 rowIndex);
void notifyQueryError() ;
- sal_Bool setCardValues(const sal_Int32 rowIndex);
- sal_Int32 commitCard(const sal_Int32 rowIndex, nsIAbDirectory * directory);
- sal_Int32 deleteCard(const sal_Int32 rowIndex, nsIAbDirectory * directory);
+ sal_Bool setCardValues(const sal_uInt32 rowIndex);
+ sal_Int32 commitCard(const sal_uInt32 rowIndex, nsIAbDirectory * directory);
+ sal_Int32 deleteCard(const sal_uInt32 rowIndex, nsIAbDirectory * directory);
};
}
}
commit 82e989726327a0b767df31b5812d3fd42fb2a4d8
Author: Catalin Iacob <iacobcatalin at gmail.com>
Date: Thu Apr 19 20:53:24 2012 +0200
WaE: Clang implicit conversion changes signedness
index is passed to getByIndex which takes sal_uInt32 so just use sal_uInt32
everywhere
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
index f727622..2c51dc9 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
@@ -195,7 +195,7 @@ MQueryHelperResultEntry*
MQueryHelper::next( )
{
MQueryHelperResultEntry* result;
- sal_Int32 index;
+ sal_uInt32 index;
m_aMutex.acquire();
index = m_nIndex;
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
index ce8091b..741f935 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
@@ -76,7 +76,7 @@ namespace connectivity
mutable ::osl::Mutex m_aMutex;
::osl::Condition m_aCondition;
resultsArray m_aResults;
- sal_Int32 m_nIndex;
+ sal_uInt32 m_nIndex;
sal_Bool m_bHasMore;
sal_Bool m_bAtEnd;
sal_Bool m_bErrorCondition;
commit 5fbaa2f228ee4d60a5f7f7a21bf00933b7ae8fff
Author: Catalin Iacob <iacobcatalin at gmail.com>
Date: Thu Apr 19 20:48:00 2012 +0200
WaE: Clang expression result unused
diff --git a/connectivity/source/drivers/jdbc/Array.cxx b/connectivity/source/drivers/jdbc/Array.cxx
index d7ccb2a..16d7cf8 100644
--- a/connectivity/source/drivers/jdbc/Array.cxx
+++ b/connectivity/source/drivers/jdbc/Array.cxx
@@ -71,7 +71,7 @@ sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) throw(::com::sun::star::sdbc:
static jmethodID mID(NULL);
obtainMethodId(t.pEnv, cMethodName,cSignature, mID);
// submit Java-Call
- (jobjectArray)t.pEnv->CallObjectMethod( object, mID, obj);
+ t.pEnv->CallObjectMethod( object, mID, obj);
ThrowSQLException(t.pEnv,*this);
// and clean up
t.pEnv->DeleteLocalRef(obj);
@@ -89,7 +89,7 @@ sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) throw(::com::sun::star::sdbc:
// submit Java-Call
static jmethodID mID(NULL);
obtainMethodId(t.pEnv, cMethodName,cSignature, mID);
- (jobjectArray)t.pEnv->CallObjectMethod( object, mID, index,count,obj);
+ t.pEnv->CallObjectMethod( object, mID, index,count,obj);
ThrowSQLException(t.pEnv,*this);
// and clean up
t.pEnv->DeleteLocalRef(obj);
commit 835a063cee7f40169e3223cd2c56204e24d912f4
Author: Catalin Iacob <iacobcatalin at gmail.com>
Date: Wed Apr 18 22:52:21 2012 +0200
WaE: patch CLucene to avoid Clang unused parameter warning
diff --git a/clucene/CustomTarget_source.mk b/clucene/CustomTarget_source.mk
index 474d1b8..55e5d24 100644
--- a/clucene/CustomTarget_source.mk
+++ b/clucene/CustomTarget_source.mk
@@ -66,6 +66,7 @@ $(CLSO)/done : $(cl_FIXED_TARFILE_LOCATION) \
$(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-gcc-atomics.patch && \
$(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-debug.patch && \
$(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-narrowing-conversions.patch && \
+ $(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-multimap-put.patch && \
for i in `find $(CLSO)/ -name "*.cpp"`; do mv $$i $${i%%cpp}cxx; done)
#FIXME ?, our rules expect .cxx
ifneq ($(OS),WNT)
diff --git a/clucene/patches/clucene-multimap-put.patch b/clucene/patches/clucene-multimap-put.patch
new file mode 100644
index 0000000..bfff31a
--- /dev/null
+++ b/clucene/patches/clucene-multimap-put.patch
@@ -0,0 +1,9 @@
+--- src/core/CLucene/util/VoidMap.h
++++ src/core/CLucene/util/VoidMap.h
+@@ -316,6 +316,7 @@ public:
+ if ( _this::dk || _this::dv )
+ _this::remove(k);
+
++ (*this)[k] = v;
+ }
+ };
commit 8eb9c441d4dc7b1a1fc3a1fbf4104b2fda1d071d
Author: Catalin Iacob <iacobcatalin at gmail.com>
Date: Mon Mar 26 21:44:15 2012 +0200
WaE: Clang adding 'int' to a string does not append to the string
diff --git a/odk/source/unoapploader/unx/unoapploader.c b/odk/source/unoapploader/unx/unoapploader.c
index 391667a..087f086 100644
--- a/odk/source/unoapploader/unx/unoapploader.c
+++ b/odk/source/unoapploader/unx/unoapploader.c
@@ -99,8 +99,10 @@ int main( int argc, char *argv[] )
size_t pathlen = strlen(path);
struct stat stat;
int ret;
+
+ char unoinfoSuffix[] = "/unoinfo";
char * unoinfo = malloc(
- pathlen + RTL_CONSTASCII_LENGTH("/unoinfo") + 1);
+ pathlen + RTL_CONSTASCII_LENGTH(unoinfoSuffix) + 1);
/*TODO: overflow */
if (unoinfo == NULL) {
fprintf(stderr, "Error: out of memory!\n");
@@ -109,7 +111,7 @@ int main( int argc, char *argv[] )
strcpy(unoinfo, path);
strcpy(
unoinfo + pathlen,
- "/unoinfo" + (pathlen == 0 || path[pathlen - 1] != '/' ? 0 : 1));
+ unoinfoSuffix + (pathlen == 0 || path[pathlen - 1] != '/' ? 0 : 1));
ret = lstat(unoinfo, &stat);
free(unoinfo);
commit 7de8936d089f88f7976a8cc9aa172c02295e895c
Author: Catalin Iacob <iacobcatalin at gmail.com>
Date: Sun Mar 25 17:13:11 2012 +0200
WaE: Clang empty forloop body
Clang says:
stripped_scanner.ll:198:46: error: for loop has empty body [-Werror,-Wempty-body]
stripped_scanner.ll:198:46: note: put the semicolon on a separate line to silence this warning [-Wempty-body]
diff --git a/idlc/source/scanner.ll b/idlc/source/scanner.ll
index 1fdbeab..62ce288 100644
--- a/idlc/source/scanner.ll
+++ b/idlc/source/scanner.ll
@@ -195,7 +195,8 @@ static double asciiToFloat(const sal_Char *s)
}
if (e > 0)
{
- for (k = 1; e > 0; k *= 10, e--) ;
+ for (k = 1; e > 0; k *= 10, e--)
+ ;
if (negexp)
d /= k;
else
More information about the Libreoffice-commits
mailing list