Page MenuHomeFreeBSD

D31610.diff
No OneTemporary

D31610.diff

diff --git a/usr.sbin/crunch/crunchgen/crunchgen.c b/usr.sbin/crunch/crunchgen/crunchgen.c
--- a/usr.sbin/crunch/crunchgen/crunchgen.c
+++ b/usr.sbin/crunch/crunchgen/crunchgen.c
@@ -85,27 +85,28 @@
/* global state */
-strlst_t *buildopts = NULL;
-strlst_t *srcdirs = NULL;
-strlst_t *libs = NULL;
-strlst_t *libs_so = NULL;
-prog_t *progs = NULL;
-
-char confname[MAXPATHLEN], infilename[MAXPATHLEN];
-char outmkname[MAXPATHLEN], outcfname[MAXPATHLEN], execfname[MAXPATHLEN];
-char tempfname[MAXPATHLEN], cachename[MAXPATHLEN], curfilename[MAXPATHLEN];
-bool tempfname_initialized = false;
-char outhdrname[MAXPATHLEN] ; /* user-supplied header for *.mk */
-const char *objprefix; /* where are the objects ? */
-const char *path_make;
-int linenum = -1;
-int goterror = 0;
-
-int verbose, readcache; /* options */
-int reading_cache;
-int makeobj = 0; /* add 'make obj' rules to the makefile */
-
-int list_mode;
+static strlst_t *buildopts = NULL;
+static strlst_t *srcdirs = NULL;
+static strlst_t *libs = NULL;
+static strlst_t *libs_so = NULL;
+static prog_t *progs = NULL;
+
+static char confname[MAXPATHLEN], infilename[MAXPATHLEN];
+static char outmkname[MAXPATHLEN], outcfname[MAXPATHLEN], execfname[MAXPATHLEN];
+static char tempfname[MAXPATHLEN], cachename[MAXPATHLEN];
+static char curfilename[MAXPATHLEN];
+static bool tempfname_initialized = false;
+static char outhdrname[MAXPATHLEN] ; /* user-supplied header for *.mk */
+static const char *objprefix; /* where are the objects ? */
+static const char *path_make;
+static int linenum = -1;
+static int goterror = 0;
+
+static int verbose, readcache; /* options */
+static int reading_cache;
+static int makeobj = 0; /* add 'make obj' rules to the makefile */
+
+static int list_mode;
/* general library routines */
diff --git a/usr.sbin/crunch/crunchgen/mkskel.sh b/usr.sbin/crunch/crunchgen/mkskel.sh
--- a/usr.sbin/crunch/crunchgen/mkskel.sh
+++ b/usr.sbin/crunch/crunchgen/mkskel.sh
@@ -4,6 +4,7 @@
cat <<!EOF
/* File created via mkskel.sh */
+extern const char *crunched_skel[];
const char *crunched_skel[] = {
!EOF

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 10, 6:43 PM (6 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16537425
Default Alt Text
D31610.diff (2 KB)

Event Timeline