From e037381f85413fe6329c54e49ccfcac88dd71048 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Mon, 3 Jul 2017 13:10:00 +0200
Subject: loplugin:unusedfields in slideshow..svtools

Change-Id: I74d5a4b8cfc4b18267f99648a3112b163c91fd8c
Reviewed-on: https://gerrit.libreoffice.org/39474
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 soltools/cpp/_cpp.c     | 2 +-
 soltools/cpp/_include.c | 6 +++---
 soltools/cpp/_lex.c     | 2 --
 soltools/cpp/_macro.c   | 4 ++--
 soltools/cpp/_nlist.c   | 2 +-
 soltools/cpp/_tokens.c  | 1 -
 soltools/cpp/cpp.h      | 1 -
 7 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'soltools')

diff --git a/soltools/cpp/_cpp.c b/soltools/cpp/_cpp.c
index 08520f4a8a7a..5d71e8af58c0 100644
--- a/soltools/cpp/_cpp.c
+++ b/soltools/cpp/_cpp.c
@@ -29,7 +29,7 @@ char outbuf[OUTS];
 char *outptr = outbuf;
 Source *cursource;
 int nerrs;
-struct token nltoken = {NL, 0, 0, 1, (uchar *) "\n", 0};
+struct token nltoken = {NL, 0, 1, (uchar *) "\n", 0};
 char *curtime;
 int incdepth;
 int ifdepth;
diff --git a/soltools/cpp/_include.c b/soltools/cpp/_include.c
index 1ddba80802b6..ba5866db1daf 100644
--- a/soltools/cpp/_include.c
+++ b/soltools/cpp/_include.c
@@ -149,7 +149,7 @@ syntax:
 void
     genline(void)
 {
-    static Token ta = {UNCLASS, 0, 0, 0, NULL, 0};
+    static Token ta = {UNCLASS, 0, 0, NULL, 0};
     static Tokenrow tr = {&ta, &ta, &ta + 1, 1};
     uchar *p;
 
@@ -181,7 +181,7 @@ void
 void
     genimport(char *fname, int angled, char *iname, int import)
 {
-    static Token ta = {UNCLASS, 0, 0, 0, NULL, 0};
+    static Token ta = {UNCLASS, 0, 0, NULL, 0};
     static Tokenrow tr = {&ta, &ta, &ta + 1, 1};
     uchar *p;
 
@@ -223,7 +223,7 @@ void
 void
     genwrap(int end)
 {
-    static Token ta = {UNCLASS, 0, 0, 0, NULL, 0};
+    static Token ta = {UNCLASS, 0, 0, NULL, 0};
     static Tokenrow tr = {&ta, &ta, &ta + 1, 1};
     uchar *p;
 
diff --git a/soltools/cpp/_lex.c b/soltools/cpp/_lex.c
index b732e5398bf7..94f218a536ef 100644
--- a/soltools/cpp/_lex.c
+++ b/soltools/cpp/_lex.c
@@ -371,7 +371,6 @@ continue2:
         tp->type = UNCLASS;
         tp->t = ip;
         tp->wslen = 0;
-        tp->flag = 0;
         state = START;
         for (;;)
         {
@@ -532,7 +531,6 @@ continue2:
                         runelen = 1;
                         s->lineinc = 0;
                         tp->type = COMMENT;
-                        tp->flag |= XTWS;
                     }
             }
             break;
diff --git a/soltools/cpp/_macro.c b/soltools/cpp/_macro.c
index 70b6ba824842..0a64b060152c 100644
--- a/soltools/cpp/_macro.c
+++ b/soltools/cpp/_macro.c
@@ -166,7 +166,7 @@ void
 {
     Nlist *np;
     static uchar onestr[2] = "1";
-    static Token onetoken[1] = {{NUMBER, 0, 0, 1, onestr, 0}};
+    static Token onetoken[1] = {{NUMBER, 0, 1, onestr, 0}};
     static Tokenrow onetr = {onetoken, onetoken, onetoken + 1, 1};
 
     trp->tp = trp->bp;
@@ -645,7 +645,7 @@ int
 Tokenrow *
     stringify(Tokenrow * vp)
 {
-    static Token t = {STRING, 0, 0, 0, NULL, 0};
+    static Token t = {STRING, 0, 0, NULL, 0};
     static Tokenrow tr = {&t, &t, &t + 1, 1};
     Token *tp;
     uchar s[STRLEN];
diff --git a/soltools/cpp/_nlist.c b/soltools/cpp/_nlist.c
index 3bd1a6557d9b..3dbb54c7d1a7 100644
--- a/soltools/cpp/_nlist.c
+++ b/soltools/cpp/_nlist.c
@@ -80,7 +80,7 @@ void
     struct kwtab *kp;
     Nlist *np;
     Token t;
-    static Token deftoken[1] = {{NAME, 0, 0, 7, (uchar *) "defined", 0}};
+    static Token deftoken[1] = {{NAME, 0, 7, (uchar *) "defined", 0}};
     static Tokenrow deftr = {deftoken, deftoken, deftoken + 1, 1};
 
     for (kp = kwtab; kp->kw; kp++)
diff --git a/soltools/cpp/_tokens.c b/soltools/cpp/_tokens.c
index bac421647035..097b627e88b6 100644
--- a/soltools/cpp/_tokens.c
+++ b/soltools/cpp/_tokens.c
@@ -280,7 +280,6 @@ void
         strncpy((char *)tt, (char *)ntp->t - ntp->wslen, ntp->wslen);
         tp->t = tt + ntp->wslen;
         tp->wslen = ntp->wslen;
-        tp->flag |= XPWS;
     }
 }
 
diff --git a/soltools/cpp/cpp.h b/soltools/cpp/cpp.h
index 7628e43ae3d2..dc8dd8965e66 100644
--- a/soltools/cpp/cpp.h
+++ b/soltools/cpp/cpp.h
@@ -74,7 +74,6 @@ extern void setup_kwtab(void);
 typedef struct token
 {
     unsigned char type;
-    unsigned char flag;
     size_t wslen;
     size_t len;
     uchar *t;
-- 
cgit