Skip to content

Commit

Permalink
apps: constify some string parameters
Browse files Browse the repository at this point in the history
There are certainly many more constifiable strings in the various
interfaces, which I hope to get to eventually.

Signed-off-by: Geoff Thorpe <[email protected]>
  • Loading branch information
Geoff Thorpe committed Apr 25, 2014
1 parent 647f360 commit 76c3ff6
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions apps/s_apps.h
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,9 @@ int ssl_print_point_formats(BIO *out, SSL *s);
int ssl_print_curves(BIO *out, SSL *s, int noshared);
#endif
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 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);

long MS_CALLBACK bio_dump_callback(BIO *bio, int cmd, const char *argp,
Expand Down
12 changes: 6 additions & 6 deletions apps/s_socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ typedef unsigned int u_int;
#include "netdb.h"
#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))
static void ssl_sock_cleanup(void);
#endif
Expand All @@ -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_long(int *sock, int port,char *ip, int type);
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
#define SOCKET_PROTOCOL 0 /* more microsoft stupidity */
Expand Down Expand Up @@ -229,7 +229,7 @@ static int ssl_sock_init(void)
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];

Expand Down Expand Up @@ -498,7 +498,7 @@ int extract_host_port(char *str, char **host_ptr, unsigned char *ip,
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];
int i;
Expand Down Expand Up @@ -544,7 +544,7 @@ static int host_ip(char *str, unsigned char ip[4])
return(0);
}

int extract_port(char *str, short *port_ptr)
int extract_port(const char *str, short *port_ptr)
{
int i;
struct servent *s;
Expand Down Expand Up @@ -576,7 +576,7 @@ static struct ghbn_cache_st
static unsigned long ghbn_hits=0L;
static unsigned long ghbn_miss=0L;

static struct hostent *GetHostByName(char *name)
static struct hostent *GetHostByName(const char *name)
{
struct hostent *ret;
int i,lowi=0;
Expand Down

0 comments on commit 76c3ff6

Please sign in to comment.