[Libreoffice-commits] core.git: soltools/cpp

[Libreoffice Gerrit user]

 soltools/cpp/_cpp.c    |    4 ++--
 soltools/cpp/_eval.c   |    8 ++++----
 soltools/cpp/_lex.c    |    4 +---
 soltools/cpp/_tokens.c |    2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

New commits:
commit 41493823f98a1751df943b07da8b887f29052ffb
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Sat Sep 15 19:08:24 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Sun Sep 16 20:53:28 2018 +0200

    loplugin:external in Executable_cpp
    
    ...showing that tottok and tokkind are actually unused
    
    Change-Id: Ic70f4f1fd7b585b00e98b538d116599e395a43b9
    Reviewed-on: https://gerrit.libreoffice.org/60536
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/soltools/cpp/_cpp.c b/soltools/cpp/_cpp.c
index 5d71e8af58c0..56c309321157 100644
--- a/soltools/cpp/_cpp.c
+++ b/soltools/cpp/_cpp.c
@@ -25,10 +25,10 @@
 #include "cpp.h"
 
 #define OUTS    16384
-char outbuf[OUTS];
+static char outbuf[OUTS];
 char *outptr = outbuf;
 Source *cursource;
-int nerrs;
+static int nerrs;
 struct token nltoken = {NL, 0, 1, (uchar *) "\n", 0};
 char *curtime;
 int incdepth;
diff --git a/soltools/cpp/_eval.c b/soltools/cpp/_eval.c
index 498fda740e89..48526b76e94b 100644
--- a/soltools/cpp/_eval.c
+++ b/soltools/cpp/_eval.c
@@ -238,10 +238,10 @@ static struct pri priority[] =
     },                                  /* ARCHITECTURE */
 };
 
-int evalop(struct pri);
-struct value tokval(Token *);
-struct value vals[NSTAK], *vp;
-enum toktype ops[NSTAK], *op;
+static int evalop(struct pri);
+static struct value tokval(Token *);
+static struct value vals[NSTAK], *vp;
+static enum toktype ops[NSTAK], *op;
 
 /*
  * Evaluate an #if #elif #ifdef #ifndef line.  trp->tp points to the keyword.
diff --git a/soltools/cpp/_lex.c b/soltools/cpp/_lex.c
index 6a5becb32679..3fa180b040a4 100644
--- a/soltools/cpp/_lex.c
+++ b/soltools/cpp/_lex.c
@@ -64,8 +64,6 @@ enum state
     S_STNL, S_COMNL, S_EOFCOM, S_COMMENT, S_EOB, S_WS, S_NAME
 };
 
-int tottok;
-int tokkind[256];
 struct fsm
 {
     int state;                          /* if in this state */
@@ -256,7 +254,7 @@ static /*const*/ struct fsm fsm[] = {
 
 /* first index is char, second is state */
 /* increase #states to power of 2 to encourage use of shift */
-short bigfsm[256][MAXSTATE];
+static short bigfsm[256][MAXSTATE];
 
 void
     expandlex(void)
diff --git a/soltools/cpp/_tokens.c b/soltools/cpp/_tokens.c
index c099f7ae1f89..6842de38301f 100644
--- a/soltools/cpp/_tokens.c
+++ b/soltools/cpp/_tokens.c
@@ -66,7 +66,7 @@ static unsigned char toLatin1[256] =
 
 #define MASK    "\\x%x"
 
-int
+static int
     memcpy_EBCDIC( char * pwbuf, uchar const *p, int len )
 {
     int currpos = 0;