diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2011-04-12 16:05:23 -0700 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2011-05-24 17:41:19 -0700 |
| commit | 99abe6b32def53ab8b2e34ca630ffa99f230313a (patch) | |
| tree | f3490dd683305f61554d65afa34edb4230e0c77c | |
| parent | 0caed7231667a617d26e9f3a01ce91412ae34539 (diff) | |
tet: tet_getvar needs to take a const char* argument
config.c: In function ‘initconfig’:
config.c:394: error: passing argument 1 of ‘_initconfig’ from incompatible pointer type
config.c:328: note: expected ‘char * (*)(const char *)’ but argument is of type ‘char * (*)(char *)’
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | include/tet_api.h | 5 | ||||
| -rw-r--r-- | src/tet3/apilib/dconfig.c | 5 | ||||
| -rw-r--r-- | src/tet3/llib/llib-lapi.c | 5 | ||||
| -rw-r--r-- | src/tet3/tcm/dtcm.c | 4 |
4 files changed, 9 insertions, 10 deletions
diff --git a/include/tet_api.h b/include/tet_api.h index 1f70e287..36561eaf 100644 --- a/include/tet_api.h +++ b/include/tet_api.h @@ -104,6 +104,9 @@ MODIFICATIONS: Andrew Dingwall, UniSoft Ltd., August 1998 Added support for shared libraries. + Aaron Plattner, NVIDIA Corporation, April 2011 + tet_getvar needs to take a const char* argument. + ************************************************************************/ #ifndef TET_API_H_INCLUDED @@ -311,7 +314,7 @@ extern "C" { /* functions in TETware-Lite and in Distrubuted TETware */ TET_IMPORT_FUNC(void, tet_delete, TET_PROTOLIST((int, char *))); TET_NORETURN TET_IMPORT_FUNC(void, tet_exit, TET_PROTOLIST((int))); -TET_IMPORT_FUNC(char *, tet_getvar, TET_PROTOLIST((char *))); +TET_IMPORT_FUNC(char *, tet_getvar, TET_PROTOLIST((const char *))); TET_IMPORT_FUNC(void, tet_infoline, TET_PROTOLIST((char *))); TET_IMPORT_FUNC(int, tet_kill, TET_PROTOLIST((pid_t, int))); TET_IMPORT_FUNC(void, tet_logoff, TET_PROTOLIST((void))); diff --git a/src/tet3/apilib/dconfig.c b/src/tet3/apilib/dconfig.c index 6306dc21..12955790 100644 --- a/src/tet3/apilib/dconfig.c +++ b/src/tet3/apilib/dconfig.c @@ -54,7 +54,7 @@ AUTHOR: Geoff Clare, UniSoft Ltd. DATE CREATED: 27 July 1990 SYNOPSIS: - char *tet_getvar(char *name); + char *tet_getvar(const char *name); void tet_config(void); @@ -106,8 +106,7 @@ MODIFICATIONS: static char **varptrs; static int lvarptrs, nvarptrs; -TET_IMPORT char *tet_getvar(name) -char *name; +TET_IMPORT char *tet_getvar(const char *name) { /* return value of specified configuration variable */ diff --git a/src/tet3/llib/llib-lapi.c b/src/tet3/llib/llib-lapi.c index 949f156a..4904bb0c 100644 --- a/src/tet3/llib/llib-lapi.c +++ b/src/tet3/llib/llib-lapi.c @@ -101,10 +101,9 @@ struct tet_sysent *sysp; return 0; } -char *tet_getvar(name) -char *name; +char *tet_getvar(const char *name) { - return((char *) 0); + return((const char *) 0); } void tet_infoline(data) diff --git a/src/tet3/tcm/dtcm.c b/src/tet3/tcm/dtcm.c index 331886d7..ecfc0a3d 100644 --- a/src/tet3/tcm/dtcm.c +++ b/src/tet3/tcm/dtcm.c @@ -659,9 +659,7 @@ int sig; static void -sig_init(var, set) -char *var; -sigset_t *set; +sig_init(const char *var, sigset_t *set) { /* initialise signal set from list in specified variable */ |