mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

file param is used in DEBUG mode

Browse Source 
regression from
    commit 4c19552052
    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@collabora.co.uk>
This commit is contained in:
Noel Grandin
2018-11-26 09:04:22 +02:00
parent 7fcdc7efe8
commit 313a0efb1d
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
soltools/mkdepend/parse.c
View File

@@ -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 char *hash_lookup( char *symbol, struct symhash *symbols );
static int gobble( struct filepointer *filep, struct inclist *file, static int gobble( struct filepointer *filep, struct inclist *file,
struct inclist *file_red, struct symhash *symbols ); 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); int parse_it, struct symhash *symbols);
static int zero_value(char const *exp, 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; int type;
while ((line = get_line(filep))) { while ((line = get_line(filep))) {
type = deftype(line, filep, TRUE, symbols); type = deftype(line, filep, file, TRUE, symbols);
switch(type) { switch(type) {
case IF: case IF:
doif: doif:
@@ -106,7 +106,7 @@ int gobble(struct filepointer *filep,
int type; int type;
while ((line = get_line(filep))) { while ((line = get_line(filep))) {
type = deftype(line, filep, FALSE, symbols); type = deftype(line, filep, file, FALSE, symbols);
switch(type) { switch(type) {
case IF: case IF:
case IFFALSE: case IFFALSE:
@@ -133,11 +133,13 @@ int gobble(struct filepointer *filep,
/* /*
* Decide what type of # directive this line is. * 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 *p;
char *directive, savechar; char *directive, savechar;
int ret; int ret;
(void)file; // used in DEBUG mode
(void)filep; (void)filep;
/* /*
* Parse the directive... * Parse the directive...