moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues 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> 2010-10-11 Giuseppe Scrivano <gscrivano@gnu.org>
* ftp.c (getftp): Fix indentation. * 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) socket_ip_address (int sock, ip_address *ip, int endpoint)
{ {
struct sockaddr_storage storage; struct sockaddr_storage storage;
struct sockaddr *sockaddr = (struct sockaddr *)&storage; struct sockaddr *sockaddr = (struct sockaddr *) &storage;
socklen_t addrlen = sizeof (storage); socklen_t addrlen = sizeof (storage);
int ret; int ret;
memset (sockaddr, 0, addrlen);
if (endpoint == ENDPOINT_LOCAL) if (endpoint == ENDPOINT_LOCAL)
ret = getsockname (sock, sockaddr, &addrlen); ret = getsockname (sock, sockaddr, &addrlen);
else if (endpoint == ENDPOINT_PEER) 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)); DEBUGP(("respline is %s\n", respline));
/* Parse the response. */
s = respline;
/* Skip the useless stuff and get what's inside the parentheses */ /* Skip the useless stuff and get what's inside the parentheses */
start = strchr (respline, '('); start = strchr (respline, '(');
if (start == NULL) if (start == NULL)
@ -804,7 +801,7 @@ ftp_epsv (int csock, ip_address *ip, int *port)
return FTPINVPASV; return FTPINVPASV;
} }
if (*s++ != ')') if (*s != ')')
{ {
xfree (respline); xfree (respline);
return FTPINVPASV; return FTPINVPASV;

221
src/ftp-ls.c
View File

@ -459,7 +459,7 @@ ftp_parse_winnt_ls (const char *file)
if (len < 40) continue; if (len < 40) continue;
tok = line + 39; tok = line + 39;
cur.name = xstrdup(tok); 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 /* First column: mm-dd-yy. Should atoi() on the month fail, january
will be assumed. */ will be assumed. */
@ -490,7 +490,7 @@ ftp_parse_winnt_ls (const char *file)
if (hour == 12) hour = 0; if (hour == 12) hour = 0;
if (*tok == 'P') hour += 12; 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)); year+1900, month, day, hour, min));
/* Build the time-stamp (copy & paste from above) */ /* 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.tstamp = mktime (&timestruct); /* store the time-stamp */
cur.ptype = TT_HOUR_MIN; 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 /* Third column: Either file length, or <DIR>. We also set the
permissions (guessed as 0644 for plain files and 0755 for 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.type = FT_DIRECTORY;
cur.size = 0; cur.size = 0;
cur.perms = 0755; cur.perms = 0755;
DEBUGP(("Directory\n")); DEBUGP (("Directory\n"));
} }
else else
{ {
@ -534,7 +534,7 @@ ftp_parse_winnt_ls (const char *file)
else else
cur.size = size; cur.size = size;
cur.perms = 0644; 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; cur.linkto = NULL;
@ -752,7 +752,7 @@ ftp_parse_vms_ls (const char *file)
tok = strtok(line, " "); tok = strtok(line, " ");
if (tok == NULL) tok = 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. /* 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 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)) #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) != '^')) if ((*p == ';') && (*(p- 1) != '^'))
{ {
*p = '\0'; *p = '\0';
@ -777,8 +777,8 @@ ftp_parse_vms_ls (const char *file)
Eliminate "^" escape characters from ODS5 extended file name. Eliminate "^" escape characters from ODS5 extended file name.
(A caret is invalid in an ODS2 name, so this is always safe.) (A caret is invalid in an ODS2 name, so this is always safe.)
*/ */
eat_carets( tok); eat_carets (tok);
DEBUGP(("file name-^: '%s'\n", tok)); DEBUGP (("file name-^: '%s'\n", tok));
/* Differentiate between a directory and any other file. A VMS /* Differentiate between a directory and any other file. A VMS
listing may not include file protections (permissions). Set a 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 ".DIR;1" file type and version number, as the plain name is
what will work in a CWD command. what will work in a CWD command.
*/ */
len = strlen( tok); len = strlen (tok);
if (!strncasecmp( (tok+ (len- 4)), ".DIR", 4)) if (!strncasecmp((tok + (len - 4)), ".DIR", 4))
{ {
*(tok+ (len -= 4)) = '\0'; /* Discard ".DIR". */ *(tok+ (len - 4)) = '\0'; /* Discard ".DIR". */
cur.type = FT_DIRECTORY; cur.type = FT_DIRECTORY;
cur.perms = VMS_DEFAULT_PROT_DIR; 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.type = FT_DIRECTORY;
cur.perms = VMS_DEFAULT_PROT_DIR; cur.perms = VMS_DEFAULT_PROT_DIR;
DEBUGP(("Directory (v)\n")); DEBUGP (("Directory (v)\n"));
} }
else else
{ {
cur.type = FT_PLAINFILE; cur.type = FT_PLAINFILE;
cur.perms = VMS_DEFAULT_PROT_FILE; cur.perms = VMS_DEFAULT_PROT_FILE;
DEBUGP(("File\n")); DEBUGP (("File\n"));
} }
cur.name = xstrdup(tok); cur.name = xstrdup (tok);
DEBUGP(("Name: '%s'\n", cur.name)); DEBUGP (("Name: '%s'\n", cur.name));
/* Null the date and time string. */ /* Null the date and time string. */
*date_str = '\0'; *date_str = '\0';
@ -821,21 +821,21 @@ ftp_parse_vms_ls (const char *file)
hence useless for an integrity check based on byte-count. hence useless for an integrity check based on byte-count.
Set size to unknown. Set size to unknown.
*/ */
cur.size = 0; cur.size = 0;
/* Get token 2, if any. A long name may force all other data onto /* Get token 2, if any. A long name may force all other data onto
a second line. If needed, read the second line. a second line. If needed, read the second line.
*/ */
tok = strtok(NULL, " "); tok = strtok (NULL, " ");
if (tok == NULL) if (tok == NULL)
{ {
DEBUGP(("Getting additional line.\n")); DEBUGP (("Getting additional line.\n"));
xfree (line); xfree (line);
line = read_whole_line (fp); line = read_whole_line (fp);
if (!line) if (!line)
{ {
DEBUGP(("EOF. Leaving listing parser.\n")); DEBUGP (("EOF. Leaving listing parser.\n"));
break; break;
} }
@ -843,15 +843,15 @@ ftp_parse_vms_ls (const char *file)
line (and we may be confused). line (and we may be confused).
*/ */
if (i <= 0) if (i <= 0)
{ {
/* Blank line. End of significant file listing. */ /* 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. */ xfree (line); /* Free useless line storage. */
break; break;
} }
else if (line[ 0] != ' ') 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; continue;
} }
else else
@ -860,7 +860,7 @@ ftp_parse_vms_ls (const char *file)
if (tok == NULL) if (tok == NULL)
{ {
/* Unexpected non-empty but apparently blank line. */ /* 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. */ xfree (line); /* Free useless line storage. */
break; break;
} }
@ -875,87 +875,87 @@ ftp_parse_vms_ls (const char *file)
Time: HH:MM or HH:MM:SS or HH:MM:SS.CC Time: HH:MM or HH:MM:SS or HH:MM:SS.CC
Owner: [user] or [user,group] Owner: [user] or [user,group]
Protection: (ppp,ppp,ppp,ppp) (where "ppp" is "RWED" or some Protection: (ppp,ppp,ppp,ppp) (where "ppp" is "RWED" or some
subset thereof, for System, Owner, Group, World. subset thereof, for System, Owner, Group, World.
If permission is lacking, info may be replaced by the string: If permission is lacking, info may be replaced by the string:
"No privilege for attempted operation". "No privilege for attempted operation".
*/ */
while (tok != NULL) while (tok != NULL)
{ {
DEBUGP (("Token: >%s<: ", tok)); DEBUGP (("Token: >%s<: ", tok));
if ((strlen( tok) < 12) && (strchr( tok, '-') != NULL)) if ((strlen (tok) < 12) && (strchr( tok, '-') != NULL))
{ {
/* Date. */ /* Date. */
DEBUGP (("Date.\n")); DEBUGP (("Date.\n"));
strcpy( date_str, tok); strcpy( date_str, tok);
strcat( date_str, " "); strcat( date_str, " ");
} }
else if ((strlen( tok) < 12) && (strchr( tok, ':') != NULL)) else if ((strlen (tok) < 12) && (strchr( tok, ':') != NULL))
{ {
/* Time. */ /* Time. */
DEBUGP (("Time. ")); DEBUGP (("Time. "));
strncat( date_str, strncat( date_str,
tok, tok,
(sizeof( date_str)- strlen( date_str)- 1)); (sizeof( date_str)- strlen (date_str) - 1));
DEBUGP (("Date time: >%s<\n", date_str)); DEBUGP (("Date time: >%s<\n", date_str));
} }
else if (strchr( tok, '[') != NULL) else if (strchr ( tok, '[') != NULL)
{ {
/* Owner. (Ignore.) */ /* Owner. (Ignore.) */
DEBUGP (("Owner.\n")); DEBUGP (("Owner.\n"));
} }
else if (strchr( tok, '(') != NULL) else if (strchr (tok, '(') != NULL)
{ {
/* Protections (permissions). */ /* Protections (permissions). */
perms = 0; perms = 0;
j = 0; j = 0;
for (i = 0; i < strlen( tok); i++) for (i = 0; i < strlen( tok); i++)
{ {
switch (tok[ i]) switch (tok[ i])
{ {
case '(': case '(':
break; break;
case ')': case ')':
break; break;
case ',': case ',':
if (j == 0) if (j == 0)
{ {
perms = 0; perms = 0;
j = 1; j = 1;
} }
else else
{ {
perms <<= 3; perms <<= 3;
} }
break; break;
case 'R': case 'R':
perms |= 4; perms |= 4;
break; break;
case 'W': case 'W':
perms |= 2; perms |= 2;
break; break;
case 'E': case 'E':
perms |= 1; perms |= 1;
break; break;
case 'D': case 'D':
perms |= 2; perms |= 2;
break; break;
} }
} }
cur.perms = perms; cur.perms = perms;
DEBUGP (("Prot. perms = %0o.\n", cur.perms)); DEBUGP (("Prot. perms = %0o.\n", cur.perms));
} }
else else
{ {
/* Nondescript. Probably size(s), probably in blocks. /* Nondescript. Probably size(s), probably in blocks.
Could be "No privilege ..." message. (Ignore.) Could be "No privilege ..." message. (Ignore.)
*/ */
DEBUGP (("Ignored (size?).\n")); DEBUGP (("Ignored (size?).\n"));
} }
tok = strtok (NULL, " "); tok = strtok (NULL, " ");
} }
/* Tokens exhausted. Interpret the data, and fill in the /* Tokens exhausted. Interpret the data, and fill in the
structure. structure.
@ -971,26 +971,21 @@ ftp_parse_vms_ls (const char *file)
/* Convert struct tm local time to time_t local time. */ /* Convert struct tm local time to time_t local time. */
timenow = mktime (timestruct); timenow = mktime (timestruct);
/* Offset local time according to environment variable (seconds). */ /* 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)); DEBUGP (("Time differential = %d.\n", dt));
} }
else else
{ dt = 0;
dt = 0;
}
if (dt >= 0) if (dt >= 0)
{ timenow += dt;
timenow += dt;
}
else else
{ timenow -= (-dt);
timenow -= (-dt);
}
cur.tstamp = timenow; /* Store the time-stamp. */ cur.tstamp = timenow; /* Store the time-stamp. */
DEBUGP(("Timestamp: %ld\n", cur.tstamp)); DEBUGP (("Timestamp: %ld\n", cur.tstamp));
cur.ptype = TT_HOUR_MIN; cur.ptype = TT_HOUR_MIN;
/* Add the data for this item to the linked list, */ /* Add the data for this item to the linked list, */

11
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 *line = fd_read_line (fd);
char *endl; char *endl;
if (line == NULL) if (line == NULL)
{ break;
ret = -1;
break;
}
remaining_chunk_size = strtol (line, &endl, 16); remaining_chunk_size = strtol (line, &endl, 16);
if (remaining_chunk_size == 0) if (remaining_chunk_size == 0)
{ {
ret = 0; fd_read_line (fd);
if (fd_read_line (fd) == NULL)
ret = -1;
break; break;
} }
} }
@ -3136,7 +3131,7 @@ Remote file exists.\n\n"));
while (!opt.ntry || (count < opt.ntry)); while (!opt.ntry || (count < opt.ntry));
exit: exit:
if (ret == RETROK) if (ret == RETROK && local_file)
*local_file = xstrdup (hstat.local_file); *local_file = xstrdup (hstat.local_file);
free_hstat (&hstat); free_hstat (&hstat);

2
src/init.c
View File

@ -431,7 +431,7 @@ wgetrc_env_file_name (void)
char * char *
wgetrc_user_file_name (void) wgetrc_user_file_name (void)
{ {
char *home = home_dir (); char *home;
char *file = NULL; char *file = NULL;
/* If that failed, try $HOME/.wgetrc (or equivalent). */ /* 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 short options for convenience and backward
compatibility. */ compatibility. */
char *p; char *p;
for (p = optarg; *p; p++) for (p = optarg; p && *p; p++)
switch (*p) switch (*p)
{ {
case 'v': 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))); 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); register_download (u->url, local_file);
if (redirection_count && 0 != strcmp (origurl, u->url)) 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++ = '?'; *p++ = '?';
if (flags & scm_has_fragment) if (flags & scm_has_fragment)
*p++ = '#'; *p++ = '#';
*p++ = '\0'; *p = '\0';
return seps; return seps;
} }