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

[Libreoffice Gerrit user]

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

New commits:
commit 313a0efb1d703a36030a7e5e55bd308c7e4650f3
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Nov 26 09:04:22 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Nov 26 10:11:04 2018 +0100

    file param is used in DEBUG mode
    
    regression from
        commit 4c19552052083b9b10d581f1a93f6ddecf241bcd
        remove some unused enum values and defines in soltools
    
    Change-Id: I897a75a65ab31068dbb9c51b111c81ab848506c9
    Reviewed-on: https://gerrit.libreoffice.org/64018
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/soltools/mkdepend/parse.c b/soltools/mkdepend/parse.c
index 7a8e4f96e2ac..a25fd9cd2bcd 100644
--- a/soltools/mkdepend/parse.c
+++ b/soltools/mkdepend/parse.c
@@ -33,7 +33,7 @@ in this Software without prior written authorization from the X Consortium.
 static char *hash_lookup( char *symbol, struct symhash *symbols );
 static int gobble( struct filepointer *filep, struct inclist *file,
     struct inclist *file_red, struct symhash *symbols );
-static int deftype ( char *line, struct filepointer *filep,
+static int deftype ( char *line, struct filepointer *filep, struct inclist *file,
     int parse_it, struct symhash *symbols);
 static int zero_value(char const *exp, struct symhash *symbols);
 
@@ -45,7 +45,7 @@ int find_includes(struct filepointer *filep, struct inclist *file, struct inclis
     int    type;
 
     while ((line = get_line(filep))) {
-        type = deftype(line, filep, TRUE, symbols);
+        type = deftype(line, filep, file, TRUE, symbols);
         switch(type) {
         case IF:
         doif:
@@ -106,7 +106,7 @@ int gobble(struct filepointer *filep,
     int    type;
 
     while ((line = get_line(filep))) {
-        type = deftype(line, filep, FALSE, symbols);
+        type = deftype(line, filep, file, FALSE, symbols);
         switch(type) {
         case IF:
         case IFFALSE:
@@ -133,11 +133,13 @@ int gobble(struct filepointer *filep,
 /*
  * Decide what type of # directive this line is.
  */
-int deftype (char *line, struct filepointer *filep, 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)file; // used in DEBUG mode
     (void)filep;
     /*
      * Parse the directive...