1
0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00

Silent warnings reported by clang.

This commit is contained in:
Giuseppe Scrivano 2010-10-16 03:04:25 +02:00
parent 7ae38d431e
commit 542c549985
9 changed files with 130 additions and 130 deletions

View File

@ -1,3 +1,15 @@
2010-10-16 Giuseppe Scrivano <gscrivano@gnu.org>
* connect.c (socket_ip_address): Initialize `sockaddr' to zero.
* ftp-basic.c (ftp_epsv): Remove dead assignment to `s'.
* ftp-ls.c (ftp_parse_vms_ls): Remove dead assignment to `len'.
* http.c (skip_short_body): Remove dead assignment to `ret'.
* init.c (wgetrc_user_file_name): Remove dead assignment to `home'.
* main.c (main): Silent warning reported by clang.
(http_loop): Silent warning reported by clang.
* retr.c (retrieve_url): Likewise.
* url.c (init_seps): Remove dead assignment to `p'.
2010-10-11 Giuseppe Scrivano <gscrivano@gnu.org>
* ftp.c (getftp): Fix indentation.

View File

@ -545,6 +545,7 @@ socket_ip_address (int sock, ip_address *ip, int endpoint)
socklen_t addrlen = sizeof (storage);
int ret;
memset (sockaddr, 0, addrlen);
if (endpoint == ENDPOINT_LOCAL)
ret = getsockname (sock, sockaddr, &addrlen);
else if (endpoint == ENDPOINT_PEER)

View File

@ -756,9 +756,6 @@ ftp_epsv (int csock, ip_address *ip, int *port)
DEBUGP(("respline is %s\n", respline));
/* Parse the response. */
s = respline;
/* Skip the useless stuff and get what's inside the parentheses */
start = strchr (respline, '(');
if (start == NULL)
@ -804,7 +801,7 @@ ftp_epsv (int csock, ip_address *ip, int *port)
return FTPINVPASV;
}
if (*s++ != ')')
if (*s != ')')
{
xfree (respline);
return FTPINVPASV;

View File

@ -790,14 +790,14 @@ ftp_parse_vms_ls (const char *file)
len = strlen (tok);
if (!strncasecmp((tok + (len - 4)), ".DIR", 4))
{
*(tok+ (len -= 4)) = '\0'; /* Discard ".DIR". */
*(tok+ (len - 4)) = '\0'; /* Discard ".DIR". */
cur.type = FT_DIRECTORY;
cur.perms = VMS_DEFAULT_PROT_DIR;
DEBUGP (("Directory (nv)\n"));
}
else if (!strncasecmp ((tok + (len - 6)), ".DIR;1", 6))
{
*(tok+ (len -= 6)) = '\0'; /* Discard ".DIR;1". */
*(tok+ (len - 6)) = '\0'; /* Discard ".DIR;1". */
cur.type = FT_DIRECTORY;
cur.perms = VMS_DEFAULT_PROT_DIR;
DEBUGP (("Directory (v)\n"));
@ -977,18 +977,13 @@ ftp_parse_vms_ls (const char *file)
DEBUGP (("Time differential = %d.\n", dt));
}
else
{
dt = 0;
}
if (dt >= 0)
{
timenow += dt;
}
else
{
timenow -= (-dt);
}
cur.tstamp = timenow; /* Store the time-stamp. */
DEBUGP (("Timestamp: %ld\n", cur.tstamp));
cur.ptype = TT_HOUR_MIN;

View File

@ -927,17 +927,12 @@ skip_short_body (int fd, wgint contlen, bool chunked)
char *line = fd_read_line (fd);
char *endl;
if (line == NULL)
{
ret = -1;
break;
}
remaining_chunk_size = strtol (line, &endl, 16);
if (remaining_chunk_size == 0)
{
ret = 0;
if (fd_read_line (fd) == NULL)
ret = -1;
fd_read_line (fd);
break;
}
}
@ -3136,7 +3131,7 @@ Remote file exists.\n\n"));
while (!opt.ntry || (count < opt.ntry));
exit:
if (ret == RETROK)
if (ret == RETROK && local_file)
*local_file = xstrdup (hstat.local_file);
free_hstat (&hstat);

View File

@ -431,7 +431,7 @@ wgetrc_env_file_name (void)
char *
wgetrc_user_file_name (void)
{
char *home = home_dir ();
char *home;
char *file = NULL;
/* If that failed, try $HOME/.wgetrc (or equivalent). */

View File

@ -962,7 +962,7 @@ main (int argc, char **argv)
short options for convenience and backward
compatibility. */
char *p;
for (p = optarg; *p; p++)
for (p = optarg; p && *p; p++)
switch (*p)
{
case 'v':

View File

@ -868,7 +868,7 @@ retrieve_url (struct url * orig_parsed, const char *origurl, char **file,
DEBUGP (("[Couldn't fallback to non-utf8 for %s\n", quote (url)));
}
if (local_file && *dt & RETROKF)
if (local_file && u && *dt & RETROKF)
{
register_download (u->url, local_file);
if (redirection_count && 0 != strcmp (origurl, u->url))

View File

@ -631,7 +631,7 @@ init_seps (enum url_scheme scheme)
*p++ = '?';
if (flags & scm_has_fragment)
*p++ = '#';
*p++ = '\0';
*p = '\0';
return seps;
}