diff options
| -rw-r--r-- | gencode.c | 2 | ||||
| -rw-r--r-- | rpcap-protocol.c | 2 | ||||
| -rw-r--r-- | rpcap-protocol.h | 2 | ||||
| -rw-r--r-- | rpcapd/log-stderr.c | 2 | ||||
| -rwxr-xr-x | rpcapd/rpcapd.c | 2 | ||||
| -rw-r--r-- | testprogs/selpolltest.c | 2 | ||||
| -rw-r--r-- | testprogs/valgrindtest.c | 2 |
7 files changed, 7 insertions, 7 deletions
@@ -1735,7 +1735,7 @@ gen_load_a(compiler_state_t *cstate, enum e_offrel offrel, u_int offset, default: abort(); - return NULL; + /* NOTREACHED */ } return s; } diff --git a/rpcap-protocol.c b/rpcap-protocol.c index 607d5bd2..692f7c5c 100644 --- a/rpcap-protocol.c +++ b/rpcap-protocol.c @@ -78,7 +78,7 @@ * error message is returned in the 'errbuf' variable. */ int -rpcap_senderror(SOCKET sock, uint8 ver, unsigned short errcode, char *error, char *errbuf) +rpcap_senderror(SOCKET sock, uint8 ver, unsigned short errcode, const char *error, char *errbuf) { char sendbuf[RPCAP_NETBUF_SIZE]; /* temporary buffer in which data to be sent is buffered */ int sendbufidx = 0; /* index which keeps the number of bytes currently buffered */ diff --git a/rpcap-protocol.h b/rpcap-protocol.h index c78580f9..83ebdc5b 100644 --- a/rpcap-protocol.h +++ b/rpcap-protocol.h @@ -445,6 +445,6 @@ struct rpcap_sampling extern void rpcap_createhdr(struct rpcap_header *header, uint8 ver, uint8 type, uint16 value, uint32 length); extern const char *rpcap_msg_type_string(uint8 type); -extern int rpcap_senderror(SOCKET sock, uint8 ver, uint16 errcode, char *error, char *errbuf); +extern int rpcap_senderror(SOCKET sock, uint8 ver, uint16 errcode, const char *error, char *errbuf); #endif diff --git a/rpcapd/log-stderr.c b/rpcapd/log-stderr.c index 4fce0ece..5af6f2e5 100644 --- a/rpcapd/log-stderr.c +++ b/rpcapd/log-stderr.c @@ -30,7 +30,7 @@ rpcapd_log(log_priority priority, const char *message, ...) default: abort(); - return; + /* NOTREACHED */ } fprintf(stderr, "rpcapd: %s", tag); diff --git a/rpcapd/rpcapd.c b/rpcapd/rpcapd.c index 69c6d7fe..6af0bb8c 100755 --- a/rpcapd/rpcapd.c +++ b/rpcapd/rpcapd.c @@ -114,7 +114,7 @@ static unsigned __stdcall main_passive_serviceloop_thread(void *ptr); */ static void printusage(void) { - char *usagetext = + const char *usagetext = "USAGE:" " " PROGRAM_NAME " [-b <address>] [-p <port>] [-4] [-l <host_list>] [-a <host,port>]\n" " [-n] [-v] [-d] " diff --git a/testprogs/selpolltest.c b/testprogs/selpolltest.c index 339d72ad..329281dc 100644 --- a/testprogs/selpolltest.c +++ b/testprogs/selpolltest.c @@ -70,7 +70,7 @@ main(int argc, char **argv) bpf_u_int32 localnet, netmask; register char *cp, *cmdbuf, *device; int doselect, dopoll, dotimeout, dononblock; - char *mechanism; + const char *mechanism; struct bpf_program fcode; char ebuf[PCAP_ERRBUF_SIZE]; pcap_if_t *devlist; diff --git a/testprogs/valgrindtest.c b/testprogs/valgrindtest.c index c2e3d790..104ef6a9 100644 --- a/testprogs/valgrindtest.c +++ b/testprogs/valgrindtest.c @@ -233,7 +233,7 @@ main(int argc, char **argv) int dorfmon, useactivate; char ebuf[PCAP_ERRBUF_SIZE]; char *infile; - char *cmdbuf; + const char *cmdbuf; pcap_if_t *devlist; pcap_t *pd; int status = 0; |