diff options
| author | Ezra Peisach <epeisach@mit.edu> | 2001-06-21 22:17:51 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 2001-06-21 22:17:51 +0000 |
| commit | c871afdb60d31ec9245f80c3e965fc0767915948 (patch) | |
| tree | bdb22a869b0079ccaa17f8d5910992cd980f8dea /src/lib/gssapi | |
| parent | dbf80690a83094fe8a44dc338cc0012daf62d992 (diff) | |
| download | krb5-c871afdb60d31ec9245f80c3e965fc0767915948.tar.gz krb5-c871afdb60d31ec9245f80c3e965fc0767915948.tar.xz krb5-c871afdb60d31ec9245f80c3e965fc0767915948.zip | |
* util_validate.c (g_validate, g_save, g_delete): If HAVE_BSD_TYPE
is not defined, declare static functions as taking a void *type for
passing to g_set_entry_add.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13468 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/gssapi')
| -rw-r--r-- | src/lib/gssapi/generic/ChangeLog | 6 | ||||
| -rw-r--r-- | src/lib/gssapi/generic/util_validate.c | 17 |
2 files changed, 21 insertions, 2 deletions
diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog index 731eab20b4..2667577041 100644 --- a/src/lib/gssapi/generic/ChangeLog +++ b/src/lib/gssapi/generic/ChangeLog @@ -1,3 +1,9 @@ +2001-06-21 Ezra Peisach <epeisach@mit.edu> + + * util_validate.c (g_validate, g_save, g_delete): If HAVE_BSD_TYPE + is not defined, declare static functions as taking a void *type for + passing to g_set_entry_add. + 2001-05-08 Ezra Peisach <epeisach@mit.edu> * disp_major_status.c (display_unknown): Remove unused variable. diff --git a/src/lib/gssapi/generic/util_validate.c b/src/lib/gssapi/generic/util_validate.c index 3cb34fb975..5c12cf6692 100644 --- a/src/lib/gssapi/generic/util_validate.c +++ b/src/lib/gssapi/generic/util_validate.c @@ -56,7 +56,11 @@ typedef struct _vkey { static int g_save(db, type, ptr) void **db; +#ifdef HAVE_BSD_DB int type; +#else + void *type; +#endif void *ptr; { #ifdef HAVE_BSD_DB @@ -76,18 +80,23 @@ static int g_save(db, type, ptr) return((*((*vdb)->put))(*vdb, &key, &dbtone, 0) == 0); #else g_set *gs = (g_set *) db; + void *a = (void *) type; if (!*gs) if (g_set_init(gs)) return(0); - return(g_set_entry_add(gs, ptr, (void *) type) == 0); + return(g_set_entry_add(gs, ptr, type) == 0); #endif } static int g_validate(db, type, ptr) void **db; +#ifdef HAVE_BSD_DB int type; +#else + void *type; +#endif void *ptr; { #ifdef HAVE_BSD_DB @@ -119,13 +128,17 @@ static int g_validate(db, type, ptr) if (g_set_entry_get(gs, ptr, (void **) &value)) return(0); - return(((int) value) == type); + return(value == type); #endif } static int g_delete(db, type, ptr) void **db; +#ifdef HAVE_BSD_DB int type; +#else + void *type; +#endif void *ptr; { #ifdef HAVE_BSD_DB |