github-repos/wget
1
0
Fork 0
mirror of https://github.com/mirror/wget.git synced 2025-01-17 07:40:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Silent warnings reported by clang.

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ChangeLog
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.

3
src/connect.c
View File

@ -541,10 +541,11 @@ bool
socket_ip_address (int sock, ip_address *ip, int endpoint)
{
struct sockaddr_storage storage;
struct sockaddr *sockaddr = (struct sockaddr *)&storage;
struct sockaddr *sockaddr = (struct sockaddr *) &storage;
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)

5
src/ftp-basic.c
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;

73
src/ftp-ls.c
View File

@ -459,7 +459,7 @@ ftp_parse_winnt_ls (const char *file)
if (len < 40) continue;
tok = line + 39;
cur.name = xstrdup(tok);
DEBUGP(("Name: '%s'\n", cur.name));
DEBUGP (("Name: '%s'\n", cur.name));
/* First column: mm-dd-yy. Should atoi() on the month fail, january
will be assumed. */
@ -490,7 +490,7 @@ ftp_parse_winnt_ls (const char *file)
if (hour == 12) hour = 0;
if (*tok == 'P') hour += 12;
DEBUGP(("YYYY/MM/DD HH:MM - %d/%02d/%02d %02d:%02d\n",
DEBUGP (("YYYY/MM/DD HH:MM - %d/%02d/%02d %02d:%02d\n",
year+1900, month, day, hour, min));
/* Build the time-stamp (copy & paste from above) */
@ -506,7 +506,7 @@ ftp_parse_winnt_ls (const char *file)
cur.tstamp = mktime (&timestruct); /* store the time-stamp */
cur.ptype = TT_HOUR_MIN;
DEBUGP(("Timestamp: %ld\n", cur.tstamp));
DEBUGP (("Timestamp: %ld\n", cur.tstamp));
/* Third column: Either file length, or <DIR>. We also set the
permissions (guessed as 0644 for plain files and 0755 for
@ -521,7 +521,7 @@ ftp_parse_winnt_ls (const char *file)
cur.type = FT_DIRECTORY;
cur.size = 0;
cur.perms = 0755;
DEBUGP(("Directory\n"));
DEBUGP (("Directory\n"));
}
else
{
@ -534,7 +534,7 @@ ftp_parse_winnt_ls (const char *file)
else
cur.size = size;
cur.perms = 0644;
DEBUGP(("File, size %s bytes\n", number_to_static_string (cur.size)));
DEBUGP (("File, size %s bytes\n", number_to_static_string (cur.size)));
}
cur.linkto = NULL;
@ -752,7 +752,7 @@ ftp_parse_vms_ls (const char *file)
tok = strtok(line, " ");
if (tok == NULL) tok = line;
DEBUGP(("file name: '%s'\n", tok));
DEBUGP (("file name: '%s'\n", tok));
/* Stripping the version number on a VMS system would be wrong.
It may be foolish on a non-VMS system, too, but that's someone
@ -766,7 +766,7 @@ ftp_parse_vms_ls (const char *file)
*/
#if (!defined( __VMS) && !defined( PRESERVE_VMS_VERSIONS))
for (p = tok+ strlen( tok); (--p > tok) && c_isdigit( *p); );
for (p = tok + strlen (tok); (--p > tok) && c_isdigit( *p); );
if ((*p == ';') && (*(p- 1) != '^'))
{
*p = '\0';
@ -777,8 +777,8 @@ ftp_parse_vms_ls (const char *file)
Eliminate "^" escape characters from ODS5 extended file name.
(A caret is invalid in an ODS2 name, so this is always safe.)
*/
eat_carets( tok);
DEBUGP(("file name-^: '%s'\n", tok));
eat_carets (tok);
DEBUGP (("file name-^: '%s'\n", tok));
/* Differentiate between a directory and any other file. A VMS
listing may not include file protections (permissions). Set a
@ -787,29 +787,29 @@ ftp_parse_vms_ls (const char *file)
".DIR;1" file type and version number, as the plain name is
what will work in a CWD command.
*/
len = strlen( tok);
if (!strncasecmp( (tok+ (len- 4)), ".DIR", 4))
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"));
DEBUGP (("Directory (nv)\n"));
}
else if (!strncasecmp( (tok+ (len- 6)), ".DIR;1", 6))
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"));
DEBUGP (("Directory (v)\n"));
}
else
{
cur.type = FT_PLAINFILE;
cur.perms = VMS_DEFAULT_PROT_FILE;
DEBUGP(("File\n"));
DEBUGP (("File\n"));
}
cur.name = xstrdup(tok);
DEBUGP(("Name: '%s'\n", cur.name));
cur.name = xstrdup (tok);
DEBUGP (("Name: '%s'\n", cur.name));
/* Null the date and time string. */
*date_str = '\0';
@ -827,15 +827,15 @@ ftp_parse_vms_ls (const char *file)
a second line. If needed, read the second line.
*/
tok = strtok(NULL, " ");
tok = strtok (NULL, " ");
if (tok == NULL)
{
DEBUGP(("Getting additional line.\n"));
DEBUGP (("Getting additional line.\n"));
xfree (line);
line = read_whole_line (fp);
if (!line)
{
DEBUGP(("EOF. Leaving listing parser.\n"));
DEBUGP (("EOF. Leaving listing parser.\n"));
break;
}
@ -845,13 +845,13 @@ ftp_parse_vms_ls (const char *file)
if (i <= 0)
{
/* Blank line. End of significant file listing. */
DEBUGP(("Blank line. Leaving listing parser.\n"));
DEBUGP (("Blank line. Leaving listing parser.\n"));
xfree (line); /* Free useless line storage. */
break;
}
else if (line[ 0] != ' ')
{
DEBUGP(("Non-blank in column 1. Must be a new file name?\n"));
DEBUGP (("Non-blank in column 1. Must be a new file name?\n"));
continue;
}
else
@ -860,7 +860,7 @@ ftp_parse_vms_ls (const char *file)
if (tok == NULL)
{
/* Unexpected non-empty but apparently blank line. */
DEBUGP(("Null token. Leaving listing parser.\n"));
DEBUGP (("Null token. Leaving listing parser.\n"));
xfree (line); /* Free useless line storage. */
break;
}
@ -884,28 +884,28 @@ ftp_parse_vms_ls (const char *file)
{
DEBUGP (("Token: >%s<: ", tok));
if ((strlen( tok) < 12) && (strchr( tok, '-') != NULL))
if ((strlen (tok) < 12) && (strchr( tok, '-') != NULL))
{
/* Date. */
DEBUGP (("Date.\n"));
strcpy( date_str, tok);
strcat( date_str, " ");
}
else if ((strlen( tok) < 12) && (strchr( tok, ':') != NULL))
else if ((strlen (tok) < 12) && (strchr( tok, ':') != NULL))
{
/* Time. */
DEBUGP (("Time. "));
strncat( date_str,
tok,
(sizeof( date_str)- strlen( date_str)- 1));
(sizeof( date_str)- strlen (date_str) - 1));
DEBUGP (("Date time: >%s<\n", date_str));
}
else if (strchr( tok, '[') != NULL)
else if (strchr ( tok, '[') != NULL)
{
/* Owner. (Ignore.) */
DEBUGP (("Owner.\n"));
}
else if (strchr( tok, '(') != NULL)
else if (strchr (tok, '(') != NULL)
{
/* Protections (permissions). */
perms = 0;
@ -971,26 +971,21 @@ ftp_parse_vms_ls (const char *file)
/* Convert struct tm local time to time_t local time. */
timenow = mktime (timestruct);
/* Offset local time according to environment variable (seconds). */
if ((tok = getenv( "WGET_TIMEZONE_DIFFERENTIAL")) != NULL)
if ((tok = getenv ( "WGET_TIMEZONE_DIFFERENTIAL")) != NULL)
{
dt = atoi( tok);
dt = atoi (tok);
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));
DEBUGP (("Timestamp: %ld\n", cur.tstamp));
cur.ptype = TT_HOUR_MIN;
/* Add the data for this item to the linked list, */

9
src/http.c
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);

2
src/init.c
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). */

2
src/main.c
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':

2
src/retr.c
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))

2
src/url.c
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;
}