summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartyn Russell <martyn@lanedo.com>2012-06-07 19:19:49 +0100
committerMichael Meeks <michael.meeks@suse.com>2012-06-12 12:08:33 +0100
commitd2a02df2f9725a1884131c0ab415a2b122a44420 (patch)
treefade00529acc02169c224d871b110577694b95f9
parent4019acf2974b58210ffc1b1975720553e7b5d337 (diff)
cppcheck: Avoid unused variables code warnings
Change-Id: I51ba83c5356f2eb33ed09f6516de9f004678bc8f
-rw-r--r--dmake/dbug/malloc/testmlc.c4
-rw-r--r--dmake/msdos/dstrlwr.c2
-rw-r--r--dmake/unix/runargv.c3
-rw-r--r--dmake/win95/microsft/vpp40/runargv.c1
-rw-r--r--dmake/winnt/microsft/vpp40/runargv.c1
-rw-r--r--embeddedobj/test/Container1/nativelib/nativeview.c7
-rw-r--r--extensions/test/ole/OleClient/clientTest.cxx1
-rw-r--r--l10ntools/source/help/HelpLinker.cxx7
8 files changed, 13 insertions, 13 deletions
diff --git a/dmake/dbug/malloc/testmlc.c b/dmake/dbug/malloc/testmlc.c
index 16e11736cc18..a0fd72814141 100644
--- a/dmake/dbug/malloc/testmlc.c
+++ b/dmake/dbug/malloc/testmlc.c
@@ -44,10 +44,6 @@ char **argv;
int cnt; /* number of allocated objects */
int nm = 0; /* number of mallocs */
int nre = 0; /* number of reallocs */
- int nal; /* number of allocated objects */
- int nfre; /* number of free list objects */
- long alm; /* memory in allocated objects */
- long frem; /* memory in free list */
long startsize; /* size at loop start */
long endsize; /* size at loop exit */
long maxiter = 0; /* real max # iterations */
diff --git a/dmake/msdos/dstrlwr.c b/dmake/msdos/dstrlwr.c
index 64027eb36481..79c58480ba72 100644
--- a/dmake/msdos/dstrlwr.c
+++ b/dmake/msdos/dstrlwr.c
@@ -31,8 +31,6 @@ dstrlwr(entry, target)
char *entry;
char *target;
{
- char *p;
-
if (STOBOOL(DcacheRespCase))
return;
diff --git a/dmake/unix/runargv.c b/dmake/unix/runargv.c
index 0e41c180f744..4a98254240aa 100644
--- a/dmake/unix/runargv.c
+++ b/dmake/unix/runargv.c
@@ -844,8 +844,6 @@ int pqid;
PUBLIC void
Clean_up_processes()
{
- int ret;
-
if( _procs != NIL(PR) )
{
register int i;
@@ -853,6 +851,7 @@ Clean_up_processes()
if( _procs[i].pr_valid )
{
#if !defined(USE_CREATEPROCESS)
+ int ret;
if( (ret = kill(_procs[i].pr_pid, SIGTERM)) )
{
fprintf(stderr, "Killing of pid %d from pq[%d] failed with: %s - %d ret: %d\n",
diff --git a/dmake/win95/microsft/vpp40/runargv.c b/dmake/win95/microsft/vpp40/runargv.c
index c48285913dbf..309e74548fb5 100644
--- a/dmake/win95/microsft/vpp40/runargv.c
+++ b/dmake/win95/microsft/vpp40/runargv.c
@@ -181,7 +181,6 @@ int pid;
int status;
{
register int i;
- register PR *pp;
char *dir;
for( i=0; i<Max_proc; i++ )
diff --git a/dmake/winnt/microsft/vpp40/runargv.c b/dmake/winnt/microsft/vpp40/runargv.c
index 2ffef707b7a3..61842094dda8 100644
--- a/dmake/winnt/microsft/vpp40/runargv.c
+++ b/dmake/winnt/microsft/vpp40/runargv.c
@@ -180,7 +180,6 @@ int pid;
int status;
{
register int i;
- register PR *pp;
char *dir;
for( i=0; i<Max_proc; i++ )
diff --git a/embeddedobj/test/Container1/nativelib/nativeview.c b/embeddedobj/test/Container1/nativelib/nativeview.c
index 6952fe9e96ec..0de1018050cc 100644
--- a/embeddedobj/test/Container1/nativelib/nativeview.c
+++ b/embeddedobj/test/Container1/nativelib/nativeview.c
@@ -76,7 +76,14 @@ JNIEXPORT jlong JNICALL Java_embeddedobj_test_NativeView_getNativeWindow
JAWT awt ;
JAWT_DrawingSurface* ds ;
JAWT_DrawingSurfaceInfo* dsi ;
+#ifdef WNT
JAWT_Win32DrawingSurfaceInfo* dsi_win ;
+#else
+ // FIXME: Where is dsi_x11 defined?
+ // Added below because I'm guessing this test breaks
+ //
+ // JAWT_X11DrawingSurfaceInfo*dsi_x11 ;
+#endif
jlong drawable;
/* Get the AWT */
diff --git a/extensions/test/ole/OleClient/clientTest.cxx b/extensions/test/ole/OleClient/clientTest.cxx
index 00e2a2584465..2949cc59b613 100644
--- a/extensions/test/ole/OleClient/clientTest.cxx
+++ b/extensions/test/ole/OleClient/clientTest.cxx
@@ -116,7 +116,6 @@ bool doParameterTest(const Reference<XInvocation> & inv)
Sequence<Any> seqOut;
Any arArgs[2];
- Any arValue[2];
Any arArgs1[4];
NamedArgument arg1(OUString(L"val1"), makeAny((sal_Int32) 123));
diff --git a/l10ntools/source/help/HelpLinker.cxx b/l10ntools/source/help/HelpLinker.cxx
index a95c56be1b6f..6d150a8f1f4f 100644
--- a/l10ntools/source/help/HelpLinker.cxx
+++ b/l10ntools/source/help/HelpLinker.cxx
@@ -642,8 +642,11 @@ void HelpLinker::link() throw( HelpProcessingException )
const std::string &additionalFileKey = enumer->first;
fs::path fsAdditionalFileName( additionalFileName, fs::native );
- std::string aNativeStr = fsAdditionalFileName.native_file_string();
- HCDBG(const char* pStr = aNativeStr.c_str(); std::cerr << pStr << std::endl);
+ HCDBG({
+ std::string aNativeStr = fsAdditionalFileName.native_file_string();
+ const char* pStr = aNativeStr.c_str();
+ std::cerr << pStr << std::endl;
+ });
fs::path fsTargetName( indexDirParentName / additionalFileKey );