From: tholo Date: Mon, 16 Sep 1996 03:12:27 +0000 (+0000) Subject: Fix warnings X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=f56a11c295170aa83c76a84687e0e2301c6db0b4;p=openbsd Fix warnings --- diff --git a/kerberosIV/des/ecb_enc.c b/kerberosIV/des/ecb_enc.c index 526a615f0ab..b10ee02997a 100644 --- a/kerberosIV/des/ecb_enc.c +++ b/kerberosIV/des/ecb_enc.c @@ -48,7 +48,7 @@ #include "des_locl.h" #include "spr.h" -const char *DES_version="libdes v 3.21 - 95/11/21 - eay"; +static const char *DES_version="libdes v 3.21 - 95/11/21 - eay"; void des_ecb_encrypt(input, output, ks, encrypt) des_cblock (*input); diff --git a/kerberosIV/des/fcrypt.c b/kerberosIV/des/fcrypt.c index 66f3c4ad260..2452c7a90d6 100644 --- a/kerberosIV/des/fcrypt.c +++ b/kerberosIV/des/fcrypt.c @@ -532,7 +532,7 @@ static unsigned const char cov_2char[64]={ }; #ifdef _DES_PROTO -#ifdef PERL5 +#if defined(PERL5) || defined(lint) char *des_crypt(char *buf,char *salt); #else char *crypt(char *buf,char *salt); @@ -545,7 +545,7 @@ char *crypt(); #endif #endif -#ifdef PERL5 +#if defined(PERL5) || defined(lint) char *des_crypt(buf,salt) #else char *crypt(buf,salt) diff --git a/kerberosIV/des/rpc_enc.c b/kerberosIV/des/rpc_enc.c index 5b847c2a3e1..d92807c0455 100644 --- a/kerberosIV/des/rpc_enc.c +++ b/kerberosIV/des/rpc_enc.c @@ -47,7 +47,6 @@ #include #include "des_locl.h" -#include "version.h" #ifdef _DES_PROTO int _des_crypt(char *buf,int len,struct desparams *desp); diff --git a/kerberosIV/des/version.h b/kerberosIV/des/version.h deleted file mode 100644 index aee11903f30..00000000000 --- a/kerberosIV/des/version.h +++ /dev/null @@ -1,48 +0,0 @@ -/* lib/des/version.h */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -extern char *DES_version; diff --git a/kerberosIV/kadm/kadm_cli_wrap.c b/kerberosIV/kadm/kadm_cli_wrap.c index bdba1a6b109..4a0155a54bb 100644 --- a/kerberosIV/kadm/kadm_cli_wrap.c +++ b/kerberosIV/kadm/kadm_cli_wrap.c @@ -1,4 +1,4 @@ -/* $Id: kadm_cli_wrap.c,v 1.1.1.1 1995/12/14 06:52:45 tholo Exp $ */ +/* $Id: kadm_cli_wrap.c,v 1.2 1996/09/16 03:16:27 tholo Exp $ */ /*- * Copyright (C) 1989 by the Massachusetts Institute of Technology @@ -250,7 +250,7 @@ kadm_cli_send(st_dat, st_siz, ret_dat, ret_siz) (void) strncpy((char *)act_st, KADM_VERSTR, KADM_VERSIZE); act_len = KADM_VERSIZE; - if ((retdat = kadm_cli_keyd(&sess_key, sess_sched)) != KADM_SUCCESS) { + if ((retdat = kadm_cli_keyd((des_cblock *)&sess_key, sess_sched)) != KADM_SUCCESS) { free((char *)act_st); return retdat; /* couldnt get key working */ } diff --git a/kerberosIV/ss/list_rqs.c b/kerberosIV/ss/list_rqs.c index 27f701328f2..ce1e8aceacc 100644 --- a/kerberosIV/ss/list_rqs.c +++ b/kerberosIV/ss/list_rqs.c @@ -1,4 +1,4 @@ -/* $Id: list_rqs.c,v 1.1.1.1 1995/12/14 06:52:47 tholo Exp $ */ +/* $Id: list_rqs.c,v 1.2 1996/09/16 03:12:59 tholo Exp $ */ /*- * Copyright 1987, 1988 by the Student Information Processing Board @@ -33,10 +33,10 @@ static char const twentyfive_spaces[26] = " "; static char const NL[2] = "\n"; -int +void ss_list_requests(argc, argv, sci_idx, info_ptr) int argc; - char **argv; + const char * const *argv; int sci_idx; pointer info_ptr; { diff --git a/kerberosIV/ss/listen.c b/kerberosIV/ss/listen.c index 5e24f7f99d2..e0429ab8352 100644 --- a/kerberosIV/ss/listen.c +++ b/kerberosIV/ss/listen.c @@ -1,4 +1,4 @@ -/* $Id: listen.c,v 1.1.1.1 1995/12/14 06:52:47 tholo Exp $ */ +/* $Id: listen.c,v 1.2 1996/09/16 03:12:59 tholo Exp $ */ /*- * Copyright 1987, 1988 by the Student Information Processing Board @@ -38,7 +38,7 @@ #ifndef lint static char const rcs_id[] = - "$Id: listen.c,v 1.1.1.1 1995/12/14 06:52:47 tholo Exp $"; + "$Id: listen.c,v 1.2 1996/09/16 03:12:59 tholo Exp $"; #endif #ifndef NPOSIX @@ -205,10 +205,10 @@ ss_abort_subsystem(sci_idx, code) } -int +void ss_quit(argc, argv, sci_idx, infop) int argc; - char **argv; + const char * const *argv; int sci_idx; pointer infop; { diff --git a/kerberosIV/ss/requests.c b/kerberosIV/ss/requests.c index 8484da0620f..d0b0bd05071 100644 --- a/kerberosIV/ss/requests.c +++ b/kerberosIV/ss/requests.c @@ -1,4 +1,4 @@ -/* $Id: requests.c,v 1.1.1.1 1995/12/14 06:52:46 tholo Exp $ */ +/* $Id: requests.c,v 1.2 1996/09/16 03:13:00 tholo Exp $ */ /*- * Copyright 1987, 1988, 1989 by the Student Information Processing Board @@ -24,7 +24,7 @@ #include #include "ss_internal.h" -#define DECLARE(name) name(argc,argv,sci_idx)int argc,sci_idx;char **argv; +#define DECLARE(name) void name(argc,argv,sci_idx,arg)int argc,sci_idx;const char *const *argv;void *arg; /* * ss_self_identify -- assigned by default to the "." request diff --git a/kerberosIV/ss/ss_internal.h b/kerberosIV/ss/ss_internal.h index 2c9e915e8a8..c04a5051c46 100644 --- a/kerberosIV/ss/ss_internal.h +++ b/kerberosIV/ss/ss_internal.h @@ -1,4 +1,4 @@ -/* $Id: ss_internal.h,v 1.1.1.1 1995/12/14 06:52:46 tholo Exp $ */ +/* $Id: ss_internal.h,v 1.2 1996/09/16 03:13:00 tholo Exp $ */ /*- * Copyright 1987, 1988 by the Student Information Processing Board @@ -110,6 +110,7 @@ typedef struct _ss_data { /* init values */ (*code_ptr=0,ss_info(sci_idx)->current_request) void ss_unknown_function(); void ss_delete_info_dir(); +void ss_unimplemented(int, const char * const *, int, void *); int ss_execute_line(); char **ss_parse(); ss_abbrev_info *ss_abbrev_initialize PROTOTYPE((char *, int *));