diff options
Diffstat (limited to 'src/sh_tools.c')
| -rw-r--r-- | src/sh_tools.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/src/sh_tools.c b/src/sh_tools.c index 6485a58..09677b6 100644 --- a/src/sh_tools.c +++ b/src/sh_tools.c @@ -69,7 +69,7 @@ #define FD_SETSIZE 32 #endif #ifndef FD_ZERO -#define FD_ZERO(p) memset((char *)(p), '\0', sizeof(*(p))) +#define FD_ZERO(p) memset((char *)(p), 0, sizeof(*(p))) #endif @@ -134,7 +134,7 @@ int sh_tools_iface_is_present(char *str) struct addrinfo hints; int res; - memset (&hints, '\0', sizeof (hints)); + memset (&hints, 0, sizeof (hints)); hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG; hints.ai_socktype = SOCK_STREAM; res = getaddrinfo (str, _("2543"), &hints, &ai); @@ -179,7 +179,7 @@ int sh_tools_iface_is_present(char *str) struct sockaddr_in sin; int sd; - memset(&sin, '\0', sizeof(sin)); + memset(&sin, 0, sizeof(sin)); sin.sin_family = AF_INET; if (inet_aton(str, &(sin.sin_addr))) { @@ -187,6 +187,7 @@ int sh_tools_iface_is_present(char *str) if (-1 == (sd = socket(AF_INET, SOCK_STREAM, 0))) { + /* cppcheck-suppress resourceLeak */ return 0; } @@ -863,6 +864,7 @@ int connect_port (char * address, int port, { if (tools_debug) fputs(_("-03- cached\n"), stderr); + /* cppcheck-suppress uninitStructMember */ fd = socket(ss.ss_family, SOCK_STREAM, 0); if (fd < 0) { @@ -878,8 +880,9 @@ int connect_port (char * address, int port, if (fail != (-1)) { + /* cppcheck-suppress uninitStructMember */ int addrlen = SH_SS_LEN(ss); - + if ( retry_connect(FIL__, __LINE__, fd, sh_ipvx_sockaddr_cast(&ss), addrlen) < 0) { @@ -911,7 +914,7 @@ int connect_port (char * address, int port, if (tools_debug) fputs(_("-03- not cached\n"), stderr); - memset (&hints, '\0', sizeof (hints)); + memset (&hints, 0, sizeof (hints)); hints.ai_flags = AI_ADDRCONFIG; #if defined(AI_CANONNAME) hints.ai_flags |= AI_CANONNAME; @@ -1382,6 +1385,7 @@ void sh_tools_probe_reset() return; } +#ifdef SH_ENCRYPT static int probe_ok(int flag) { (void) flag; @@ -1389,6 +1393,7 @@ static int probe_ok(int flag) return S_TRUE; return S_FALSE; } +#endif static unsigned char probe_header_set(unsigned char protocol) { @@ -1440,6 +1445,7 @@ unsigned char sh_tools_probe_store(unsigned char protocol, int * probe_flag) return protocol; } +#ifdef SH_ENCRYPT static int probe_ok(int flag) { if ((flag & SH_PROTO_IVA) != 0) @@ -1448,6 +1454,8 @@ static int probe_ok(int flag) } #endif +#endif + void get_header (unsigned char * head, unsigned long * bytes, char * u) { @@ -1664,10 +1672,10 @@ char * sh_tools_makePack (unsigned char * header, int flag, if ((i_blk*16) > payload_size && !oflow) { - memset(&full_ret[16+payload_size], '\0', (i_blk*16) - payload_size); + memset(&full_ret[16+payload_size], 0, (i_blk*16) - payload_size); payload_size = i_blk * 16; } - memset(&full_ret[16+payload_size], '\0', i_epad*16); + memset(&full_ret[16+payload_size], 0, i_epad*16); /* rewrite header */ @@ -2071,7 +2079,7 @@ char * get_client_uuid_file (const char * peer, unsigned long * length, const ch #endif -#if defined(SH_WITH_CLIENT) || defined(SH_WITH_SERVER) || defined(SH_STEALTH) || defined(WITH_GPG) || defined(WITH_PGP) +#if defined(SH_WITH_CLIENT) || defined(SH_WITH_SERVER) || defined(SH_STEALTH) || defined(WITH_SIG) /* --------- secure temporary file ------------ */ |