Kaydet (Commit) ffe2b51a authored tarafından Stephan Bergmann's avatar Stephan Bergmann

loplugin:external in Executable_mkdepend

...moving notdotdot to include.c (and some other decls to def.h)

Change-Id: I5d05988aca3daed978c2302380f69d1373081571
Reviewed-on: https://gerrit.libreoffice.org/60537
Tested-by: Jenkins
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 38aae53a
...@@ -189,8 +189,11 @@ char *append_slash(char *); ...@@ -189,8 +189,11 @@ char *append_slash(char *);
extern char * directives[]; extern char * directives[];
extern struct inclist inclist[ MAXFILES ];
extern struct inclist * inclistp; extern struct inclist * inclistp;
extern char *includedirs[ ];
extern char * objprefix; extern char * objprefix;
extern char * objsuffix; extern char * objsuffix;
......
...@@ -31,16 +31,14 @@ in this Software without prior written authorization from the X Consortium. ...@@ -31,16 +31,14 @@ in this Software without prior written authorization from the X Consortium.
#include "def.h" #include "def.h"
#include <string.h> #include <string.h>
void remove_dotdot( char * ); static void remove_dotdot( char * );
int isdot( char const * ); static int isdot( char const * );
int isdotdot( char const * ); static int isdotdot( char const * );
int issymbolic(char * dir, char * component); static int issymbolic(char * dir, char * component);
int exists_path(struct IncludesCollection*, char*); static int exists_path(struct IncludesCollection*, char*);
extern struct inclist inclist[ MAXFILES ]; static char *notdotdot[ MAXDIRS ];
extern char *includedirs[ ];
extern char *notdotdot[ ];
struct inclist *inc_path(char *file, char *include, boolean dot, struct IncludesCollection *incCollection) struct inclist *inc_path(char *file, char *include, boolean dot, struct IncludesCollection *incCollection)
{ {
......
...@@ -85,7 +85,7 @@ typedef _W64 int ssize_t; ...@@ -85,7 +85,7 @@ typedef _W64 int ssize_t;
int _debugmask; int _debugmask;
#endif #endif
char *ProgramName; static char *ProgramName;
#define OBJSUFFIX ".obj" #define OBJSUFFIX ".obj"
#define INCLUDEDIR "." #define INCLUDEDIR "."
...@@ -115,16 +115,15 @@ char *directives[] = { ...@@ -115,16 +115,15 @@ char *directives[] = {
/******* function declarations ********/ /******* function declarations ********/
/******* added by -Wall project *******/ /******* added by -Wall project *******/
void redirect(char * makefile); static void redirect(char * makefile);
struct inclist inclist[ MAXFILES ], struct inclist inclist[ MAXFILES ];
*inclistp = inclist; struct inclist *inclistp = inclist;
static struct symhash *maininclist = NULL; static struct symhash *maininclist = NULL;
char *filelist[ MAXFILES ]; static char *filelist[ MAXFILES ];
char *includedirs[ MAXDIRS + 1 ]; char *includedirs[ MAXDIRS + 1 ];
char *notdotdot[ MAXDIRS ];
char *objprefix = ""; char *objprefix = "";
char *objsuffix = OBJSUFFIX; char *objsuffix = OBJSUFFIX;
static char *startat = "# DO NOT DELETE"; static char *startat = "# DO NOT DELETE";
...@@ -158,7 +157,7 @@ catch (int sig) ...@@ -158,7 +157,7 @@ catch (int sig)
#define sa_mask sv_mask #define sa_mask sv_mask
#define sa_flags sv_flags #define sa_flags sv_flags
#endif #endif
struct sigaction sig_act; static struct sigaction sig_act;
#endif /* USGISH */ #endif /* USGISH */
static boolean native_win_slashes = FALSE; static boolean native_win_slashes = FALSE;
......
...@@ -30,13 +30,13 @@ in this Software without prior written authorization from the X Consortium. ...@@ -30,13 +30,13 @@ in this Software without prior written authorization from the X Consortium.
#include <ctype.h> #include <ctype.h>
#include "def.h" #include "def.h"
char *hash_lookup( char *symbol, struct symhash *symbols ); static char *hash_lookup( char *symbol, struct symhash *symbols );
void hash_undefine( char *symbol, struct symhash *symbols ); static void hash_undefine( char *symbol, struct symhash *symbols );
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 );
int deftype ( char *line, struct filepointer *filep, struct inclist *file, static int deftype ( char *line, struct filepointer *filep, struct inclist *file,
int parse_it, struct symhash *symbols); int parse_it, struct symhash *symbols);
int zero_value(char const *exp, struct symhash *symbols); static int zero_value(char const *exp, struct symhash *symbols);
extern struct symhash *maininclist; extern struct symhash *maininclist;
......
...@@ -29,9 +29,8 @@ in this Software without prior written authorization from the X Consortium. ...@@ -29,9 +29,8 @@ in this Software without prior written authorization from the X Consortium.
#include "def.h" #include "def.h"
#include <string.h> #include <string.h>
size_t pr( struct inclist *ip, char *file,char *base); static size_t pr( struct inclist *ip, char *file,char *base);
extern struct inclist inclist[ MAXFILES ];
extern int width; extern int width;
void add_include(struct filepointer *filep, struct inclist *file, struct inclist *file_red, char *include, boolean dot, boolean failOK, struct IncludesCollection* incCollection, struct symhash *symbols) void add_include(struct filepointer *filep, struct inclist *file, struct inclist *file_red, char *include, boolean dot, boolean failOK, struct IncludesCollection* incCollection, struct symhash *symbols)
...@@ -73,7 +72,7 @@ void add_include(struct filepointer *filep, struct inclist *file, struct inclist ...@@ -73,7 +72,7 @@ void add_include(struct filepointer *filep, struct inclist *file, struct inclist
} }
} }
void pr_dummy(struct inclist const *ip) static void pr_dummy(struct inclist const *ip)
{ {
fwrite(ip->i_file, strlen(ip->i_file), 1, stdout); fwrite(ip->i_file, strlen(ip->i_file), 1, stdout);
fwrite(" :\n\n", 4, 1, stdout); fwrite(" :\n\n", 4, 1, stdout);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment