generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

apps: constify some string parameters

Browse Source 
There are certainly many more constifiable strings in the various
interfaces, which I hope to get to eventually.

Signed-off-by: Geoff Thorpe <geoff@openssl.org>
This commit is contained in:
Geoff Thorpe 2014-04-25 14:27:02 -04:00
parent 647f360e2e
commit 76c3ff6937
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/s_apps.h
View File

@ -161,9 +161,9 @@ int ssl_print_point_formats(BIO *out, SSL *s);
int ssl_print_curves(BIO *out, SSL *s, int noshared); int ssl_print_curves(BIO *out, SSL *s, int noshared);
#endif #endif
int ssl_print_tmp_key(BIO *out, SSL *s); int ssl_print_tmp_key(BIO *out, SSL *s);
int init_client(int *sock, char *server, int port, int type); int init_client(int *sock, const char *server, int port, int type);
int should_retry(int i); int should_retry(int i);
int extract_port(char *str, short *port_ptr); int extract_port(const char *str, short *port_ptr);
int extract_host_port(char *str,char **host_ptr,unsigned char *ip,short *p); int extract_host_port(char *str,char **host_ptr,unsigned char *ip,short *p);
long MS_CALLBACK bio_dump_callback(BIO *bio, int cmd, const char *argp, long MS_CALLBACK bio_dump_callback(BIO *bio, int cmd, const char *argp,

12
apps/s_socket.c
View File

@ -91,7 +91,7 @@ typedef unsigned int u_int;
#include "netdb.h" #include "netdb.h"
#endif #endif
static struct hostent *GetHostByName(char *name); static struct hostent *GetHostByName(const char *name);
#if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK)) #if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK))
static void ssl_sock_cleanup(void); static void ssl_sock_cleanup(void);
#endif #endif
@ -101,7 +101,7 @@ static int init_client_ip(int *sock, const unsigned char ip[4], int port,
static int init_server(int *sock, int port, int type); static int init_server(int *sock, int port, int type);
static int init_server_long(int *sock, int port,char *ip, int type); static int init_server_long(int *sock, int port,char *ip, int type);
static int do_accept(int acc_sock, int *sock, char **host); static int do_accept(int acc_sock, int *sock, char **host);
static int host_ip(char *str, unsigned char ip[4]); static int host_ip(const char *str, unsigned char ip[4]);
#ifdef OPENSSL_SYS_WIN16 #ifdef OPENSSL_SYS_WIN16
#define SOCKET_PROTOCOL 0 /* more microsoft stupidity */ #define SOCKET_PROTOCOL 0 /* more microsoft stupidity */
@ -229,7 +229,7 @@ static int ssl_sock_init(void)
return(1); return(1);
} }
int init_client(int *sock, char *host, int port, int type) int init_client(int *sock, const char *host, int port, int type)
{ {
unsigned char ip[4]; unsigned char ip[4];
@ -498,7 +498,7 @@ err:
return(0); return(0);
} }
static int host_ip(char *str, unsigned char ip[4]) static int host_ip(const char *str, unsigned char ip[4])
{ {
unsigned int in[4]; unsigned int in[4];
int i; int i;
@ -544,7 +544,7 @@ err:
return(0); return(0);
} }
int extract_port(char *str, short *port_ptr) int extract_port(const char *str, short *port_ptr)
{ {
int i; int i;
struct servent *s; struct servent *s;
@ -576,7 +576,7 @@ static struct ghbn_cache_st
static unsigned long ghbn_hits=0L; static unsigned long ghbn_hits=0L;
static unsigned long ghbn_miss=0L; static unsigned long ghbn_miss=0L;
static struct hostent *GetHostByName(char *name) static struct hostent *GetHostByName(const char *name)
{ {
struct hostent *ret; struct hostent *ret;
int i,lowi=0; int i,lowi=0;