[Libreoffice-commits] core.git: rsc/source solenv/gbuild

2017-04-27 Thread Caolán McNamara 
 rsc/source/parser/erscerr.cxx |1 -
 rsc/source/rsc/rsc.cxx|   10 +-
 solenv/gbuild/AllLangResTarget.mk |   13 ++---
 solenv/gbuild/Helper.mk   |1 -
 solenv/gbuild/TargetLocations.mk  |1 -
 5 files changed, 3 insertions(+), 23 deletions(-)

New commits:
commit bfc54ba3d2ac7f7ff40f8b3e95a6bd9b74bcd0c5
Author: Caolán McNamara 
Date:   Thu Apr 27 14:43:08 2017 +0100

cut top layer of detecting used bitmap resources in .src/.res files

Change-Id: I476ff9f55c264983419d5410035c1dfe6e07d5a3
Reviewed-on: https://gerrit.libreoffice.org/37035
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx
index ce67dfd9c60b..a6dcb46cf227 100644
--- a/rsc/source/parser/erscerr.cxx
+++ b/rsc/source/parser/erscerr.cxx
@@ -151,7 +151,6 @@ void RscError::WriteError( const ERRTYPE& rError, const 
char * pMessage )
 StdLstOut( "-fs= Name of the .res file.\n" );
 StdLstOut( "-lip=additional search path for system 
dependent files\n" );
 StdLstOut( "-fp= Renaming of the .srs file.\n" );
-StdLstOut( "-oil= Output directory for image list 
files\n" );
 StdLstOut( "-sub= replace  by  in image list 
files\n" );
 StdLstOut( "-BIGENDIANFormat of number values.\n" );
 StdLstOut( "-LITTLEENDIAN Format of number values.\n" );
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index d1f19b7b103f..e736e618f8af 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -197,10 +197,6 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * 
pEH )
 aOutputSrs = (*ppStr) + 4;
 bOutputSrsIsSet = true;
 }
-else if( !rsc_strnicmp( (*ppStr) + 1, "oil=", 4 ) )
-{
-aILDir = (*ppStr) + 5;
-}
 else if( !rsc_stricmp( (*ppStr) + 1, "NoSysResTest" ) )
 { // don't check Bitmap, Pointers, Icons
 nCommands |= CommandFlags::NoSysResTest;
@@ -588,11 +584,7 @@ ERRTYPE RscCompiler::Link()
 
 aRcTmp = lcl_getTempFile(sTempDirUrl);
 
-OUString sOilDirUrl;
-if(!pCL->aILDir.isEmpty())
-sOilDirUrl = lcl_getAbsoluteUrl(sPwdUrl, pCL->aILDir);
-else
-sOilDirUrl = sTempDirUrl;
+OUString sOilDirUrl = sTempDirUrl;
 
 aSysListTmp = lcl_getTempFile(sOilDirUrl);
 
diff --git a/solenv/gbuild/AllLangResTarget.mk 
b/solenv/gbuild/AllLangResTarget.mk
index d31b10b23b3a..9da53605297e 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -244,15 +244,13 @@ $(call gb_ResTarget_get_clean_target,%) :
$(call gb_Helper_abbreviate_dirs,\
rm -f \
$(call gb_ResTarget_get_target,$*) \
-   $(call gb_ResTarget_get_install_target,$*) \
-   $(call gb_ResTarget_get_imagelist_target,$*))
+   $(call gb_ResTarget_get_install_target,$*)
 
 $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) \
$(gb_ResTarget_RSCDEPS)
$(call gb_Output_announce,$*,$(true),RES,2)
$(call gb_Helper_abbreviate_dirs,\
-   mkdir -p $(dir $@) \
-   $(dir $(call gb_ResTarget_get_imagelist_target,$*)) && \
+   mkdir -p $(dir $@) && \
RESPONSEFILE=`$(gb_MKTEMP)` && \
echo "-r -p \
-lg$(LANGUAGE) \
@@ -265,7 +263,6 @@ $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) \
-lip=$(gb_ResTarget_DEFIMAGESLOCATION)res \
-subMODULE=$(gb_ResTarget_DEFIMAGESLOCATION) \
-subGLOBALRES=$(gb_ResTarget_DEFIMAGESLOCATION)res \
-   -oil=$(dir $(call 
gb_ResTarget_get_imagelist_target,$*)) \
$(filter-out $(gb_Helper_MISCDUMMY) 
$(gb_ResTarget_RSCDEPS),$^)" \
> $${RESPONSEFILE} && \
$(gb_ResTarget_RSCCOMMAND) @$${RESPONSEFILE} && \
@@ -277,7 +274,6 @@ $(call gb_ResTarget_get_target,$(1)) : LIBRARY = $(2)
 $(call gb_ResTarget_get_target,$(1)) : LANGUAGE = $(3)
 $(call gb_ResTarget_get_target,$(1)) : RESLOCATION = $(2)
 $(call gb_AllLangResTarget_get_clean_target,$(2)) : $(call 
gb_ResTarget_get_clean_target,$(1))
-$(call gb_ResTarget_get_imagelist_target,$(1)) : $(call 
gb_ResTarget_get_target,$(1))
 
 endef
 
@@ -365,9 +361,4 @@ $(foreach lang,$(gb_AllLangResTarget_LANGS),\
 
 endef
 
-define gb_AllLangResTarget_get_imagelists
-$(foreach lang,$(gb_AllLangResTarget_LANGS),\
-$(call gb_ResTarget_get_imagelist_target,$(1)$(lang)))
-endef
-
 # vim: set noet sw=4: 
diff --git a/solenv/gbuild/Helper.mk

[Libreoffice-commits] core.git: rsc/source solenv/gbuild

2015-09-18 Thread Stephan Bergmann 
 rsc/source/rscpp/cpp.h |2 +-
 rsc/source/rscpp/cpp6.c|2 +-
 solenv/gbuild/platform/com_MSC_defs.mk |3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 7a77d77effdace1b234062dd7bb035026c893a8b
Author: Stephan Bergmann 
Date:   Fri Sep 18 11:16:54 2015 +0200

Use a C99 flexible array member

...so the following strcpy does not cause a false abort under 
_FORTIFY_SOURCE=2

Change-Id: I395136f11020064766db76f87ed8f5b01c083c3a
Reviewed-on: https://gerrit.libreoffice.org/18681
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/rsc/source/rscpp/cpp.h b/rsc/source/rscpp/cpp.h
index 1f88f7b..d0432ed 100644
--- a/rsc/source/rscpp/cpp.h
+++ b/rsc/source/rscpp/cpp.h
@@ -162,7 +162,7 @@ typedef struct defbuf
 char*   repl;   /* -> replacement   */
 int hash;   /* Symbol table hash*/
 int nargs;  /* For define(args) */
-charname[1];/* #define name */
+charname[]; /* #define name */
 } DEFBUF;
 
 /*
diff --git a/rsc/source/rscpp/cpp6.c b/rsc/source/rscpp/cpp6.c
index 74340dd..3678caa 100644
--- a/rsc/source/rscpp/cpp6.c
+++ b/rsc/source/rscpp/cpp6.c
@@ -613,7 +613,7 @@ DEFBUF* defendel(char* name, int delete)
 }
 if (!delete)
 {
-dp = (DEFBUF*) getmem(sizeof (DEFBUF) + size);
+dp = (DEFBUF*) getmem(sizeof (DEFBUF) + size + 1);
 dp->link = *prevp;
 *prevp = dp;
 dp->hash = nhash;
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index ab67e64..be9d923 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -81,6 +81,8 @@ gb_AFLAGS := $(AFLAGS)
 
 # C4189: 'identifier' : local variable is initialized but not referenced
 
+# C4200: nonstandard extension used : zero-sized array in struct/union
+
 # C4201: nonstandard extension used : nameless struct/union
 
 # C4242: 'identifier' : conversion from 'type1' to 'type2', possible
@@ -150,6 +152,7 @@ gb_CFLAGS := \
$(if $(filter 0,$(gb_DEBUGLEVEL)),-wd4100) \
-wd4127 \
$(if $(filter 0,$(gb_DEBUGLEVEL)),-wd4189) \
+   -wd4200 \
-wd4242 \
-wd4244 \
-wd4251 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits