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

Minor tweaks to Henri's patch.

Browse Source
This commit is contained in:
Micah Cowan 2008-05-31 00:24:53 -07:00
parent 48b53471e8
commit dac53e8bdf
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/html-url.c
View File

@ -355,10 +355,11 @@ append_url (const char *link_uri,
static void static void
tag_find_urls (int tagid, struct taginfo *tag, struct map_context *ctx) tag_find_urls (int tagid, struct taginfo *tag, struct map_context *ctx)
{ {
int i, attrind; size_t i;
int attrind;
int first = -1; int first = -1;
for (i = 0; i < (int) countof (tag_url_attributes); i++) for (i = 0; i < countof (tag_url_attributes); i++)
if (tag_url_attributes[i].tagid == tagid) if (tag_url_attributes[i].tagid == tagid)
{ {
/* We've found the index of tag_url_attributes where the /* We've found the index of tag_url_attributes where the
@ -382,7 +383,7 @@ tag_find_urls (int tagid, struct taginfo *tag, struct map_context *ctx)
/* Find whether TAG/ATTRIND is a combination that contains a /* Find whether TAG/ATTRIND is a combination that contains a
URL. */ URL. */
char *link = tag->attrs[attrind].value; char *link = tag->attrs[attrind].value;
const int size = countof (tag_url_attributes); const size_t size = countof (tag_url_attributes);
/* If you're cringing at the inefficiency of the nested loops, /* If you're cringing at the inefficiency of the nested loops,
remember that they both iterate over a very small number of remember that they both iterate over a very small number of

10
src/http.c
View File

@ -3020,10 +3020,11 @@ digest_authentication_encode (const char *au, const char *user,
while (extract_param (&au, &name, &value, ',')) while (extract_param (&au, &name, &value, ','))
{ {
size_t i; size_t i;
size_t namelen = name.e - name.b;
for (i = 0; i < countof (options); i++) for (i = 0; i < countof (options); i++)
if ((size_t) (name.e - name.b) == strlen (options[i].name) if (namelen == strlen (options[i].name)
&& 0 == strncmp (name.b, options[i].name, && 0 == strncmp (name.b, options[i].name,
(size_t) (name.e - name.b))) namelen))
{ {
*options[i].variable = strdupdelim (value.b, value.e); *options[i].variable = strdupdelim (value.b, value.e);
break; break;
@ -3103,9 +3104,10 @@ username=\"%s\", realm=\"%s\", nonce=\"%s\", uri=\"%s\", response=\"%s\"",
first argument and are followed by whitespace or terminating \0. first argument and are followed by whitespace or terminating \0.
The comparison is case-insensitive. */ The comparison is case-insensitive. */
#define STARTS(literal, b, e) \ #define STARTS(literal, b, e) \
(((size_t) ((e) - (b))) >= STRSIZE (literal) \ ((e > b) \
&& ((size_t) ((e) - (b))) >= STRSIZE (literal) \
&& 0 == strncasecmp (b, literal, STRSIZE (literal)) \ && 0 == strncasecmp (b, literal, STRSIZE (literal)) \
&& ((e) - (b) == STRSIZE (literal) \ && ((size_t) ((e) - (b)) == STRSIZE (literal) \
|| c_isspace (b[STRSIZE (literal)]))) || c_isspace (b[STRSIZE (literal)])))
static bool static bool