Retire env.h
This was a MINIX3-specific header file placed outside of the minix/ header subdirectory, with its definitions duplicated in the more standard minix/sysutil.h header. Also make env_prefix(3) take constant pointers. Change-Id: I243c38eb38e24eb98f0c0dddf7f340e7fec255f4
This commit is contained in:
parent
40dec70c39
commit
5f6c420586
@ -292,7 +292,7 @@
|
|||||||
./usr/include/disktab.h minix-comp
|
./usr/include/disktab.h minix-comp
|
||||||
./usr/include/dlfcn.h minix-comp
|
./usr/include/dlfcn.h minix-comp
|
||||||
./usr/include/elf.h minix-comp
|
./usr/include/elf.h minix-comp
|
||||||
./usr/include/env.h minix-comp
|
./usr/include/env.h minix-comp obsolete
|
||||||
./usr/include/err.h minix-comp
|
./usr/include/err.h minix-comp
|
||||||
./usr/include/errno.h minix-comp
|
./usr/include/errno.h minix-comp
|
||||||
./usr/include/eti.h minix-comp
|
./usr/include/eti.h minix-comp
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
NOOBJ= # defined
|
NOOBJ= # defined
|
||||||
|
|
||||||
INCS+= env.h lib.h libutil.h varargs.h configfile.h
|
INCS+= lib.h libutil.h varargs.h configfile.h
|
||||||
|
|
||||||
.include <bsd.own.mk>
|
.include <bsd.own.mk>
|
||||||
|
|
||||||
|
@ -1,4 +0,0 @@
|
|||||||
int env_parse(const char *env, const char *fmt, int field, long *param, long min,
|
|
||||||
long max);
|
|
||||||
void __dead env_panic(const char *env);
|
|
||||||
int env_prefix(char *env, char *prefix);
|
|
@ -36,8 +36,8 @@ extern char **env_argv;
|
|||||||
|
|
||||||
void env_setargs(int argc, char *argv[]);
|
void env_setargs(int argc, char *argv[]);
|
||||||
int env_get_param(const char *key, char *value, int max_size);
|
int env_get_param(const char *key, char *value, int max_size);
|
||||||
int env_prefix(char *env, char *prefix);
|
int env_prefix(const char *env, const char *prefix);
|
||||||
void env_panic(const char *key);
|
void __dead env_panic(const char *key);
|
||||||
int env_parse(const char *env, const char *fmt, int field,
|
int env_parse(const char *env, const char *fmt, int field,
|
||||||
long *param, long min, long max);
|
long *param, long min, long max);
|
||||||
|
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
#include "sysutil.h"
|
#include "sysutil.h"
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <env.h>
|
|
||||||
|
|
||||||
/*=========================================================================*
|
/*=========================================================================*
|
||||||
* env_panic *
|
* env_panic *
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
#include "sysutil.h"
|
#include "sysutil.h"
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <env.h>
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <minix/param.h>
|
#include <minix/param.h>
|
||||||
|
|
||||||
|
@ -5,11 +5,11 @@
|
|||||||
/*=========================================================================*
|
/*=========================================================================*
|
||||||
* env_prefix *
|
* env_prefix *
|
||||||
*=========================================================================*/
|
*=========================================================================*/
|
||||||
int env_prefix(env, prefix)
|
int env_prefix(const char *env, const char *prefix)
|
||||||
char *env; /* environment variable to inspect */
|
|
||||||
char *prefix; /* prefix to test for */
|
|
||||||
{
|
{
|
||||||
/* An environment setting may be prefixed by a word, usually "pci".
|
/* An environment setting may be prefixed by a word, usually "pci".
|
||||||
|
* - env: environment variable to inspect
|
||||||
|
* - prefix: prefix to test for
|
||||||
* Return TRUE if a given prefix is used.
|
* Return TRUE if a given prefix is used.
|
||||||
*/
|
*/
|
||||||
char value[EP_BUF_SIZE];
|
char value[EP_BUF_SIZE];
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
#include <sys/utsname.h>
|
#include <sys/utsname.h>
|
||||||
#include <sys/wait.h>
|
#include <sys/wait.h>
|
||||||
#include <machine/archtypes.h>
|
#include <machine/archtypes.h>
|
||||||
#include <env.h>
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include "mproc.h"
|
#include "mproc.h"
|
||||||
|
|
||||||
|
@ -29,7 +29,6 @@
|
|||||||
#include <minix/bitmap.h>
|
#include <minix/bitmap.h>
|
||||||
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <env.h>
|
|
||||||
|
|
||||||
#include "glo.h"
|
#include "glo.h"
|
||||||
#include "vm.h"
|
#include "vm.h"
|
||||||
|
@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <env.h>
|
|
||||||
|
|
||||||
#include "glo.h"
|
#include "glo.h"
|
||||||
#include "proto.h"
|
#include "proto.h"
|
||||||
|
@ -17,7 +17,6 @@
|
|||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <env.h>
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
#include "glo.h"
|
#include "glo.h"
|
||||||
|
@ -23,7 +23,6 @@
|
|||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <env.h>
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
|
@ -24,7 +24,6 @@
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <env.h>
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
|
||||||
|
@ -20,7 +20,6 @@
|
|||||||
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <env.h>
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
|
@ -21,7 +21,6 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <env.h>
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
@ -20,7 +20,6 @@
|
|||||||
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <env.h>
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <env.h>
|
|
||||||
|
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
|
|
||||||
|
@ -19,7 +19,6 @@
|
|||||||
#include <minix/rs.h>
|
#include <minix/rs.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <env.h>
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <sys/cdefs.h>
|
#include <sys/cdefs.h>
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
#include <minix/bitmap.h>
|
#include <minix/bitmap.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <env.h>
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user