Commit 9d1a01be authored by Ulf Möller's avatar Ulf Möller
Browse files

Source code cleanups: Use void * rather than char * in lhash, 

eliminate some of the -Wcast-qual warnings (debug-ben-strict target)
parent 74235cc9

Makefile.org

+2 −2
Original line number Diff line number Diff line
@@ -355,8 +355,8 @@ install: all 
		chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \

	done

	@echo installing man 1

	@for i in doc/apps/*.pod; do (cd `dirname $$i`; fn=`basename $$i .pod`; sec=`[ "$$fn" = "config" ] && echo 5 || echo 1`; ../../util/pod2man.pl --section=$$sec --date=`date +%Y-%m-%d` --center=OpenSSL --release=$(VERSION) `basename $$i` >  $(INSTALL_PREFIX)$(INSTALLTOP)/man/man$$sec/`basename $$i .pod`.$$sec); done

	@for i in doc/apps/*.pod; do (cd `dirname $$i`; fn=`basename $$i .pod`; sec=`[ "$$fn" = "config" ] && echo 5 || echo 1`; ../../util/pod2man.pl --section=$$sec --center=OpenSSL --release=$(VERSION) `basename $$i` >  $(INSTALL_PREFIX)$(INSTALLTOP)/man/man$$sec/`basename $$i .pod`.$$sec); done

	@echo installing man 3

	@for i in doc/crypto/*.pod doc/ssl/*.pod; do (cd `dirname $$i`; ../../util/pod2man.pl --section=3 --date=`date +%Y-%m-%d` --center=OpenSSL --release=$(VERSION) `basename $$i` >  $(INSTALL_PREFIX)$(INSTALLTOP)/man/man3/`basename $$i .pod`.3); done

	@for i in doc/crypto/*.pod doc/ssl/*.pod; do (cd `dirname $$i`; ../../util/pod2man.pl --section=3 --center=OpenSSL --release=$(VERSION) `basename $$i` >  $(INSTALL_PREFIX)$(INSTALLTOP)/man/man3/`basename $$i .pod`.3); done



# DO NOT DELETE THIS LINE -- make depend depends on it.

apps/openssl.c

+3 −3
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ int main(int Argc, char *Argv[]) 
	program_name(Argv[0],pname,PROG_NAME_SIZE);



	f.name=pname;

	fp=(FUNCTION *)lh_retrieve(prog,(char *)&f);

	fp=(FUNCTION *)lh_retrieve(prog,&f);

	if (fp != NULL)

		{

		Argv[0]=pname;
@@ -262,7 +262,7 @@ static int do_cmd(LHASH *prog, int argc, char *argv[]) 
	if ((argc <= 0) || (argv[0] == NULL))

		{ ret=0; goto end; }

	f.name=argv[0];

	fp=(FUNCTION *)lh_retrieve(prog,(char *)&f);

	fp=(FUNCTION *)lh_retrieve(prog,&f);

	if (fp != NULL)

		{

		ret=fp->func(argc,argv);
@@ -361,7 +361,7 @@ static LHASH *prog_init(void) 
	if ((ret=lh_new(hash,cmp)) == NULL) return(NULL);



	for (f=functions; f->name != NULL; f++)

		lh_insert(ret,(char *)f);

		lh_insert(ret,f);

	return(ret);

	}

crypto/asn1/a_type.c

+1 −1
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ void ASN1_TYPE_free(ASN1_TYPE *a) 
	{

	if (a == NULL) return;

	ASN1_TYPE_component_free(a);

	Free((char *)(char *)a);

	Free((char *)a);

	}



int ASN1_TYPE_get(ASN1_TYPE *a)

crypto/asn1/p7_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ void PKCS7_free(PKCS7 *a) 
		{

		ASN1_OBJECT_free(a->type);

		}

	Free((char *)(char *)a);

	Free((char *)a);

	}



void PKCS7_content_free(PKCS7 *a)

crypto/asn1/x_pkey.c

+1 −1
Original line number Diff line number Diff line
@@ -147,5 +147,5 @@ void X509_PKEY_free(X509_PKEY *x) 
	if (x->enc_pkey != NULL) M_ASN1_OCTET_STRING_free(x->enc_pkey);

	if (x->dec_pkey != NULL)EVP_PKEY_free(x->dec_pkey);

	if ((x->key_data != NULL) && (x->key_free)) Free((char *)x->key_data);

	Free((char *)(char *)x);

	Free((char *)x);

	}