X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fwget.h;fp=src%2Fwget.h;h=ba4ea21ea46858f2c3e1907b5640c69494bafc60;hp=3c739472dfa10e4fa34c62e7adb345b73029073a;hb=8624553a31b148f9051cc11725bc01d9760fa07b;hpb=4eeabffee6e5b348d36c4f3ba0579ed086226603 diff --git a/src/wget.h b/src/wget.h index 3c739472..ba4ea21e 100644 --- a/src/wget.h +++ b/src/wget.h @@ -254,24 +254,24 @@ typedef double SUM_SIZE_INT; /* Copy the data delimited with BEG and END to alloca-allocated storage, and zero-terminate it. Arguments are evaluated only once, in the order BEG, END, PLACE. */ -#define BOUNDED_TO_ALLOCA(beg, end, place) do { \ - const char *BTA_beg = (beg); \ - int BTA_len = (end) - BTA_beg; \ - char **BTA_dest = &(place); \ - *BTA_dest = alloca (BTA_len + 1); \ - memcpy (*BTA_dest, BTA_beg, BTA_len); \ - (*BTA_dest)[BTA_len] = '\0'; \ +#define BOUNDED_TO_ALLOCA(beg, end, place) do { \ + const char *BTA_beg = (beg); \ + int BTA_len = (end) - BTA_beg; \ + char **BTA_dest = &(place); \ + *BTA_dest = alloca (BTA_len + 1); \ + memcpy (*BTA_dest, BTA_beg, BTA_len); \ + (*BTA_dest)[BTA_len] = '\0'; \ } while (0) /* Return non-zero if string bounded between BEG and END is equal to STRING_LITERAL. The comparison is case-sensitive. */ -#define BOUNDED_EQUAL(beg, end, string_literal) \ - ((end) - (beg) == sizeof (string_literal) - 1 \ +#define BOUNDED_EQUAL(beg, end, string_literal) \ + ((end) - (beg) == sizeof (string_literal) - 1 \ && !memcmp (beg, string_literal, sizeof (string_literal) - 1)) /* The same as above, except the comparison is case-insensitive. */ -#define BOUNDED_EQUAL_NO_CASE(beg, end, string_literal) \ - ((end) - (beg) == sizeof (string_literal) - 1 \ +#define BOUNDED_EQUAL_NO_CASE(beg, end, string_literal) \ + ((end) - (beg) == sizeof (string_literal) - 1 \ && !strncasecmp (beg, string_literal, sizeof (string_literal) - 1)) /* Like ptr=strdup(str), but allocates the space for PTR on the stack. @@ -280,11 +280,11 @@ typedef double SUM_SIZE_INT; The problem is that some compilers can't handle alloca() being an argument to a function. */ -#define STRDUP_ALLOCA(ptr, str) do { \ - char **SA_dest = &(ptr); \ - const char *SA_src = (str); \ - *SA_dest = (char *)alloca (strlen (SA_src) + 1); \ - strcpy (*SA_dest, SA_src); \ +#define STRDUP_ALLOCA(ptr, str) do { \ + char **SA_dest = &(ptr); \ + const char *SA_src = (str); \ + *SA_dest = (char *)alloca (strlen (SA_src) + 1); \ + strcpy (*SA_dest, SA_src); \ } while (0) /* Generally useful if you want to avoid arbitrary size limits but @@ -295,17 +295,17 @@ typedef double SUM_SIZE_INT; NEEDED_SIZE objects. The reallocing is done by doubling, which ensures constant amortized time per element. */ -#define DO_REALLOC(basevar, sizevar, needed_size, type) do { \ - long DR_needed_size = (needed_size); \ - long DR_newsize = 0; \ - while ((sizevar) < (DR_needed_size)) { \ - DR_newsize = sizevar << 1; \ - if (DR_newsize < 16) \ - DR_newsize = 16; \ - (sizevar) = DR_newsize; \ - } \ - if (DR_newsize) \ - basevar = xrealloc (basevar, DR_newsize * sizeof (type)); \ +#define DO_REALLOC(basevar, sizevar, needed_size, type) do { \ + long DR_needed_size = (needed_size); \ + long DR_newsize = 0; \ + while ((sizevar) < (DR_needed_size)) { \ + DR_newsize = sizevar << 1; \ + if (DR_newsize < 16) \ + DR_newsize = 16; \ + (sizevar) = DR_newsize; \ + } \ + if (DR_newsize) \ + basevar = xrealloc (basevar, DR_newsize * sizeof (type)); \ } while (0) /* Used to print pointers (usually for debugging). Print pointers @@ -323,14 +323,14 @@ extern const char *exec_name; /* Document type ("dt") flags */ enum { - TEXTHTML = 0x0001, /* document is of type text/html + TEXTHTML = 0x0001, /* document is of type text/html or application/xhtml+xml */ - RETROKF = 0x0002, /* retrieval was OK */ - HEAD_ONLY = 0x0004, /* only send the HEAD request */ - SEND_NOCACHE = 0x0008, /* send Pragma: no-cache directive */ - ACCEPTRANGES = 0x0010, /* Accept-ranges header was found */ + RETROKF = 0x0002, /* retrieval was OK */ + HEAD_ONLY = 0x0004, /* only send the HEAD request */ + SEND_NOCACHE = 0x0008, /* send Pragma: no-cache directive */ + ACCEPTRANGES = 0x0010, /* Accept-ranges header was found */ ADDED_HTML_EXTENSION = 0x0020, /* added ".html" extension due to -E */ - TEXTCSS = 0x0040 /* document is of type text/css */ + TEXTCSS = 0x0040 /* document is of type text/css */ }; /* Universal error type -- used almost everywhere. Error reporting of