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

[Noel Grandin]

 soltools/mkdepend/parse.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 920447d4a5df9a4f27726a943417e946108ad3ac
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Thu Jan 11 15:44:53 2018 +0200

    tdf#114952 filep is still used in soltools/mkdepend/parse.c
    
    regression from
    
        commit 18f513145477d4621290253d936dad7a40ee4c05
        Date:   Tue Jun 20 19:54:23 2017 +0200
        loplugin:unusedfields store..svl
    
    somewhat tricky to reproduce on linux, I had to do
    
        make soltools CPPFLAGS=-DDEBUG
    
    Change-Id: I4b1989efc02b9e864432b96cf4f71a29e581bcdb
    Reviewed-on: https://gerrit.libreoffice.org/47755
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/soltools/mkdepend/parse.c b/soltools/mkdepend/parse.c
index b538c87be22b..8aa05547bbe7 100644
--- a/soltools/mkdepend/parse.c
+++ b/soltools/mkdepend/parse.c
@@ -34,7 +34,7 @@ char *hash_lookup( char *symbol, struct symhash *symbols );
 void hash_undefine( char *symbol, struct symhash *symbols );
 int gobble( struct filepointer *filep, struct inclist *file,
     struct inclist *file_red, struct symhash *symbols );
-int deftype ( char *line, struct inclist *file,
+int deftype ( char *line, struct filepointer *filep, struct inclist *file,
     int parse_it, struct symhash *symbols);
 int zero_value(char const *exp, struct symhash *symbols);
 
@@ -47,7 +47,7 @@ int find_includes(struct filepointer *filep, struct inclist *file, struct inclis
     boolean recfailOK;
 
     while ((line = get_line(filep))) {
-        switch(type = deftype(line, file, TRUE, symbols)) {
+        switch(type = deftype(line, filep, file, TRUE, symbols)) {
         case IF:
         doif:
             type = find_includes(filep, file,
@@ -170,7 +170,7 @@ int gobble(struct filepointer *filep,
     int    type;
 
     while ((line = get_line(filep))) {
-        switch(type = deftype(line, file, FALSE, symbols)) {
+        switch(type = deftype(line, filep, file, FALSE, symbols)) {
         case IF:
         case IFFALSE:
         case IFGUESSFALSE:
@@ -215,12 +215,12 @@ int gobble(struct filepointer *filep,
 /*
  * Decide what type of # directive this line is.
  */
-int deftype (char *line, struct inclist *file, int parse_it, struct symhash *symbols)
+int deftype (char *line, struct filepointer *filep, struct inclist *file, int parse_it, struct symhash *symbols)
 {
     char   *p;
     char    *directive, savechar;
     int    ret;
-
+    (void)filep;
     /*
      * Parse the directive...
      */