diff options
| author | Juanma Barranquero | 2011-09-09 03:06:52 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2011-09-09 03:06:52 +0200 |
| commit | 5e617bc2b62189768814fafd1a875e89a094d3ef (patch) | |
| tree | d96d22e012035d044557abf4de0b8e30b03d61b7 /lib-src | |
| parent | 9b1c252e294bed3aef0d2f2fc5d1fa9f72df9ee8 (diff) | |
| download | emacs-5e617bc2b62189768814fafd1a875e89a094d3ef.tar.gz emacs-5e617bc2b62189768814fafd1a875e89a094d3ef.zip | |
Whitespace changes.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ebrowse.c | 14 | ||||
| -rw-r--r-- | lib-src/etags.c | 86 | ||||
| -rw-r--r-- | lib-src/hexl.c | 2 | ||||
| -rw-r--r-- | lib-src/movemail.c | 4 | ||||
| -rw-r--r-- | lib-src/pop.c | 20 |
5 files changed, 63 insertions, 63 deletions
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c index a997e56cc9f..7395f2c8fdd 100644 --- a/lib-src/ebrowse.c +++ b/lib-src/ebrowse.c | |||
| @@ -45,16 +45,16 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 45 | 45 | ||
| 46 | /* The character used as a separator in path lists (like $PATH). */ | 46 | /* The character used as a separator in path lists (like $PATH). */ |
| 47 | 47 | ||
| 48 | #if defined(__MSDOS__) | 48 | #if defined (__MSDOS__) |
| 49 | #define PATH_LIST_SEPARATOR ';' | 49 | #define PATH_LIST_SEPARATOR ';' |
| 50 | #define FILENAME_EQ(X,Y) (strcasecmp(X,Y) == 0) | 50 | #define FILENAME_EQ(X,Y) (strcasecmp (X,Y) == 0) |
| 51 | #else | 51 | #else |
| 52 | #if defined(WINDOWSNT) | 52 | #if defined (WINDOWSNT) |
| 53 | #define PATH_LIST_SEPARATOR ';' | 53 | #define PATH_LIST_SEPARATOR ';' |
| 54 | #define FILENAME_EQ(X,Y) (stricmp(X,Y) == 0) | 54 | #define FILENAME_EQ(X,Y) (stricmp (X,Y) == 0) |
| 55 | #else | 55 | #else |
| 56 | #define PATH_LIST_SEPARATOR ':' | 56 | #define PATH_LIST_SEPARATOR ':' |
| 57 | #define FILENAME_EQ(X,Y) (streq(X,Y)) | 57 | #define FILENAME_EQ(X,Y) (streq (X,Y)) |
| 58 | #endif | 58 | #endif |
| 59 | #endif | 59 | #endif |
| 60 | /* The default output file name. */ | 60 | /* The default output file name. */ |
| @@ -2511,7 +2511,7 @@ member (struct sym *cls, int vis) | |||
| 2511 | 2511 | ||
| 2512 | /* A function or class may follow. */ | 2512 | /* A function or class may follow. */ |
| 2513 | case TEMPLATE: | 2513 | case TEMPLATE: |
| 2514 | MATCH(); | 2514 | MATCH (); |
| 2515 | SET_FLAG (flags, F_TEMPLATE); | 2515 | SET_FLAG (flags, F_TEMPLATE); |
| 2516 | /* Skip over template argument list */ | 2516 | /* Skip over template argument list */ |
| 2517 | SKIP_MATCHING_IF ('<'); | 2517 | SKIP_MATCHING_IF ('<'); |
| @@ -2930,7 +2930,7 @@ parse_qualified_ident_or_type (char **last_id) | |||
| 2930 | } | 2930 | } |
| 2931 | 2931 | ||
| 2932 | while (enter--) | 2932 | while (enter--) |
| 2933 | leave_namespace(); | 2933 | leave_namespace (); |
| 2934 | 2934 | ||
| 2935 | return cls; | 2935 | return cls; |
| 2936 | } | 2936 | } |
diff --git a/lib-src/etags.c b/lib-src/etags.c index ac5ebee9b07..cdcc6461a64 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c | |||
| @@ -103,7 +103,7 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4"; | |||
| 103 | # define PTR void * | 103 | # define PTR void * |
| 104 | # endif | 104 | # endif |
| 105 | #else /* no config.h */ | 105 | #else /* no config.h */ |
| 106 | # if defined(__STDC__) && (__STDC__ || defined(__SUNPRO_C)) | 106 | # if defined (__STDC__) && (__STDC__ || defined (__SUNPRO_C)) |
| 107 | # define PTR void * /* for generic pointers */ | 107 | # define PTR void * /* for generic pointers */ |
| 108 | # else /* not standard C */ | 108 | # else /* not standard C */ |
| 109 | # define const /* remove const for old compilers' sake */ | 109 | # define const /* remove const for old compilers' sake */ |
| @@ -202,25 +202,25 @@ If you want regular expression support, you should delete this notice and | |||
| 202 | # define CTAGS FALSE | 202 | # define CTAGS FALSE |
| 203 | #endif | 203 | #endif |
| 204 | 204 | ||
| 205 | #define streq(s,t) (assert((s)!=NULL || (t)!=NULL), !strcmp (s, t)) | 205 | #define streq(s,t) (assert ((s)!=NULL || (t)!=NULL), !strcmp (s, t)) |
| 206 | #define strcaseeq(s,t) (assert((s)!=NULL && (t)!=NULL), !etags_strcasecmp (s, t)) | 206 | #define strcaseeq(s,t) (assert ((s)!=NULL && (t)!=NULL), !etags_strcasecmp (s, t)) |
| 207 | #define strneq(s,t,n) (assert((s)!=NULL || (t)!=NULL), !strncmp (s, t, n)) | 207 | #define strneq(s,t,n) (assert ((s)!=NULL || (t)!=NULL), !strncmp (s, t, n)) |
| 208 | #define strncaseeq(s,t,n) (assert((s)!=NULL && (t)!=NULL), !etags_strncasecmp (s, t, n)) | 208 | #define strncaseeq(s,t,n) (assert ((s)!=NULL && (t)!=NULL), !etags_strncasecmp (s, t, n)) |
| 209 | 209 | ||
| 210 | #define CHARS 256 /* 2^sizeof(char) */ | 210 | #define CHARS 256 /* 2^sizeof(char) */ |
| 211 | #define CHAR(x) ((unsigned int)(x) & (CHARS - 1)) | 211 | #define CHAR(x) ((unsigned int)(x) & (CHARS - 1)) |
| 212 | #define iswhite(c) (_wht[CHAR(c)]) /* c is white (see white) */ | 212 | #define iswhite(c) (_wht[CHAR (c)]) /* c is white (see white) */ |
| 213 | #define notinname(c) (_nin[CHAR(c)]) /* c is not in a name (see nonam) */ | 213 | #define notinname(c) (_nin[CHAR (c)]) /* c is not in a name (see nonam) */ |
| 214 | #define begtoken(c) (_btk[CHAR(c)]) /* c can start token (see begtk) */ | 214 | #define begtoken(c) (_btk[CHAR (c)]) /* c can start token (see begtk) */ |
| 215 | #define intoken(c) (_itk[CHAR(c)]) /* c can be in token (see midtk) */ | 215 | #define intoken(c) (_itk[CHAR (c)]) /* c can be in token (see midtk) */ |
| 216 | #define endtoken(c) (_etk[CHAR(c)]) /* c ends tokens (see endtk) */ | 216 | #define endtoken(c) (_etk[CHAR (c)]) /* c ends tokens (see endtk) */ |
| 217 | 217 | ||
| 218 | #define ISALNUM(c) isalnum (CHAR(c)) | 218 | #define ISALNUM(c) isalnum (CHAR (c)) |
| 219 | #define ISALPHA(c) isalpha (CHAR(c)) | 219 | #define ISALPHA(c) isalpha (CHAR (c)) |
| 220 | #define ISDIGIT(c) isdigit (CHAR(c)) | 220 | #define ISDIGIT(c) isdigit (CHAR (c)) |
| 221 | #define ISLOWER(c) islower (CHAR(c)) | 221 | #define ISLOWER(c) islower (CHAR (c)) |
| 222 | 222 | ||
| 223 | #define lowcase(c) tolower (CHAR(c)) | 223 | #define lowcase(c) tolower (CHAR (c)) |
| 224 | 224 | ||
| 225 | 225 | ||
| 226 | /* | 226 | /* |
| @@ -1725,16 +1725,16 @@ init (void) | |||
| 1725 | register int i; | 1725 | register int i; |
| 1726 | 1726 | ||
| 1727 | for (i = 0; i < CHARS; i++) | 1727 | for (i = 0; i < CHARS; i++) |
| 1728 | iswhite(i) = notinname(i) = begtoken(i) = intoken(i) = endtoken(i) = FALSE; | 1728 | iswhite (i) = notinname (i) = begtoken (i) = intoken (i) = endtoken (i) = FALSE; |
| 1729 | for (sp = white; *sp != '\0'; sp++) iswhite (*sp) = TRUE; | 1729 | for (sp = white; *sp != '\0'; sp++) iswhite (*sp) = TRUE; |
| 1730 | for (sp = nonam; *sp != '\0'; sp++) notinname (*sp) = TRUE; | 1730 | for (sp = nonam; *sp != '\0'; sp++) notinname (*sp) = TRUE; |
| 1731 | notinname('\0') = notinname('\n'); | 1731 | notinname ('\0') = notinname ('\n'); |
| 1732 | for (sp = begtk; *sp != '\0'; sp++) begtoken (*sp) = TRUE; | 1732 | for (sp = begtk; *sp != '\0'; sp++) begtoken (*sp) = TRUE; |
| 1733 | begtoken('\0') = begtoken('\n'); | 1733 | begtoken ('\0') = begtoken ('\n'); |
| 1734 | for (sp = midtk; *sp != '\0'; sp++) intoken (*sp) = TRUE; | 1734 | for (sp = midtk; *sp != '\0'; sp++) intoken (*sp) = TRUE; |
| 1735 | intoken('\0') = intoken('\n'); | 1735 | intoken ('\0') = intoken ('\n'); |
| 1736 | for (sp = endtk; *sp != '\0'; sp++) endtoken (*sp) = TRUE; | 1736 | for (sp = endtk; *sp != '\0'; sp++) endtoken (*sp) = TRUE; |
| 1737 | endtoken('\0') = endtoken('\n'); | 1737 | endtoken ('\0') = endtoken ('\n'); |
| 1738 | } | 1738 | } |
| 1739 | 1739 | ||
| 1740 | /* | 1740 | /* |
| @@ -3959,16 +3959,16 @@ Yacc_entries (FILE *inf) | |||
| 3959 | ) | 3959 | ) |
| 3960 | 3960 | ||
| 3961 | #define LOOKING_AT(cp, kw) /* kw is the keyword, a literal string */ \ | 3961 | #define LOOKING_AT(cp, kw) /* kw is the keyword, a literal string */ \ |
| 3962 | ((assert("" kw), TRUE) /* syntax error if not a literal string */ \ | 3962 | ((assert ("" kw), TRUE) /* syntax error if not a literal string */ \ |
| 3963 | && strneq ((cp), kw, sizeof(kw)-1) /* cp points at kw */ \ | 3963 | && strneq ((cp), kw, sizeof (kw)-1) /* cp points at kw */ \ |
| 3964 | && notinname ((cp)[sizeof(kw)-1]) /* end of kw */ \ | 3964 | && notinname ((cp)[sizeof (kw)-1]) /* end of kw */ \ |
| 3965 | && ((cp) = skip_spaces((cp)+sizeof(kw)-1))) /* skip spaces */ | 3965 | && ((cp) = skip_spaces ((cp)+sizeof (kw)-1))) /* skip spaces */ |
| 3966 | 3966 | ||
| 3967 | /* Similar to LOOKING_AT but does not use notinname, does not skip */ | 3967 | /* Similar to LOOKING_AT but does not use notinname, does not skip */ |
| 3968 | #define LOOKING_AT_NOCASE(cp, kw) /* the keyword is a literal string */ \ | 3968 | #define LOOKING_AT_NOCASE(cp, kw) /* the keyword is a literal string */ \ |
| 3969 | ((assert("" kw), TRUE) /* syntax error if not a literal string */ \ | 3969 | ((assert ("" kw), TRUE) /* syntax error if not a literal string */ \ |
| 3970 | && strncaseeq ((cp), kw, sizeof(kw)-1) /* cp points at kw */ \ | 3970 | && strncaseeq ((cp), kw, sizeof (kw)-1) /* cp points at kw */ \ |
| 3971 | && ((cp) += sizeof(kw)-1)) /* skip spaces */ | 3971 | && ((cp) += sizeof (kw)-1)) /* skip spaces */ |
| 3972 | 3972 | ||
| 3973 | /* | 3973 | /* |
| 3974 | * Read a file, but do no processing. This is used to do regexp | 3974 | * Read a file, but do no processing. This is used to do regexp |
| @@ -4141,7 +4141,7 @@ Ada_getit (FILE *inf, const char *name_qualifier) | |||
| 4141 | readline (&lb, inf); | 4141 | readline (&lb, inf); |
| 4142 | dbp = lb.buffer; | 4142 | dbp = lb.buffer; |
| 4143 | } | 4143 | } |
| 4144 | switch (lowcase(*dbp)) | 4144 | switch (lowcase (*dbp)) |
| 4145 | { | 4145 | { |
| 4146 | case 'b': | 4146 | case 'b': |
| 4147 | if (nocase_tail ("body")) | 4147 | if (nocase_tail ("body")) |
| @@ -4245,7 +4245,7 @@ Ada_funcs (FILE *inf) | |||
| 4245 | } | 4245 | } |
| 4246 | 4246 | ||
| 4247 | /* We are at the beginning of a token. */ | 4247 | /* We are at the beginning of a token. */ |
| 4248 | switch (lowcase(*dbp)) | 4248 | switch (lowcase (*dbp)) |
| 4249 | { | 4249 | { |
| 4250 | case 'f': | 4250 | case 'f': |
| 4251 | if (!packages_only && nocase_tail ("function")) | 4251 | if (!packages_only && nocase_tail ("function")) |
| @@ -4371,7 +4371,7 @@ Perl_functions (FILE *inf) | |||
| 4371 | *cp = '\0'; | 4371 | *cp = '\0'; |
| 4372 | name = concat (package, "::", sp); | 4372 | name = concat (package, "::", sp); |
| 4373 | *cp = savechar; | 4373 | *cp = savechar; |
| 4374 | make_tag (name, strlen(name), TRUE, | 4374 | make_tag (name, strlen (name), TRUE, |
| 4375 | lb.buffer, cp - lb.buffer + 1, lineno, linecharno); | 4375 | lb.buffer, cp - lb.buffer + 1, lineno, linecharno); |
| 4376 | free (name); | 4376 | free (name); |
| 4377 | } | 4377 | } |
| @@ -4466,9 +4466,9 @@ PHP_functions (FILE *inf) | |||
| 4466 | } | 4466 | } |
| 4467 | else if (LOOKING_AT (cp, "function")) | 4467 | else if (LOOKING_AT (cp, "function")) |
| 4468 | { | 4468 | { |
| 4469 | if(*cp == '&') | 4469 | if (*cp == '&') |
| 4470 | cp = skip_spaces (cp+1); | 4470 | cp = skip_spaces (cp+1); |
| 4471 | if(*cp != '\0') | 4471 | if (*cp != '\0') |
| 4472 | { | 4472 | { |
| 4473 | name = cp; | 4473 | name = cp; |
| 4474 | while (!notinname (*cp)) | 4474 | while (!notinname (*cp)) |
| @@ -4509,7 +4509,7 @@ PHP_functions (FILE *inf) | |||
| 4509 | && *cp == '$') | 4509 | && *cp == '$') |
| 4510 | { | 4510 | { |
| 4511 | name = cp; | 4511 | name = cp; |
| 4512 | while (!notinname(*cp)) | 4512 | while (!notinname (*cp)) |
| 4513 | cp++; | 4513 | cp++; |
| 4514 | make_tag (name, cp - name, FALSE, | 4514 | make_tag (name, cp - name, FALSE, |
| 4515 | lb.buffer, cp - lb.buffer + 1, lineno, linecharno); | 4515 | lb.buffer, cp - lb.buffer + 1, lineno, linecharno); |
| @@ -4890,13 +4890,13 @@ Forth_words (FILE *inf) | |||
| 4890 | 4890 | ||
| 4891 | LOOP_ON_INPUT_LINES (inf, lb, bp) | 4891 | LOOP_ON_INPUT_LINES (inf, lb, bp) |
| 4892 | while ((bp = skip_spaces (bp))[0] != '\0') | 4892 | while ((bp = skip_spaces (bp))[0] != '\0') |
| 4893 | if (bp[0] == '\\' && iswhite(bp[1])) | 4893 | if (bp[0] == '\\' && iswhite (bp[1])) |
| 4894 | break; /* read next line */ | 4894 | break; /* read next line */ |
| 4895 | else if (bp[0] == '(' && iswhite(bp[1])) | 4895 | else if (bp[0] == '(' && iswhite (bp[1])) |
| 4896 | do /* skip to ) or eol */ | 4896 | do /* skip to ) or eol */ |
| 4897 | bp++; | 4897 | bp++; |
| 4898 | while (*bp != ')' && *bp != '\0'); | 4898 | while (*bp != ')' && *bp != '\0'); |
| 4899 | else if ((bp[0] == ':' && iswhite(bp[1]) && bp++) | 4899 | else if ((bp[0] == ':' && iswhite (bp[1]) && bp++) |
| 4900 | || LOOKING_AT_NOCASE (bp, "constant") | 4900 | || LOOKING_AT_NOCASE (bp, "constant") |
| 4901 | || LOOKING_AT_NOCASE (bp, "code") | 4901 | || LOOKING_AT_NOCASE (bp, "code") |
| 4902 | || LOOKING_AT_NOCASE (bp, "create") | 4902 | || LOOKING_AT_NOCASE (bp, "create") |
| @@ -5285,7 +5285,7 @@ Prolog_functions (FILE *inf) | |||
| 5285 | /* Predicate or rule. Store the function name so that we | 5285 | /* Predicate or rule. Store the function name so that we |
| 5286 | only generate a tag for the first clause. */ | 5286 | only generate a tag for the first clause. */ |
| 5287 | if (last == NULL) | 5287 | if (last == NULL) |
| 5288 | last = xnew(len + 1, char); | 5288 | last = xnew (len + 1, char); |
| 5289 | else if (len + 1 > allocated) | 5289 | else if (len + 1 > allocated) |
| 5290 | xrnew (last, len + 1, char); | 5290 | xrnew (last, len + 1, char); |
| 5291 | allocated = len + 1; | 5291 | allocated = len + 1; |
| @@ -5309,7 +5309,7 @@ prolog_skip_comment (linebuffer *plb, FILE *inf) | |||
| 5309 | return; | 5309 | return; |
| 5310 | readline (plb, inf); | 5310 | readline (plb, inf); |
| 5311 | } | 5311 | } |
| 5312 | while (!feof(inf)); | 5312 | while (!feof (inf)); |
| 5313 | } | 5313 | } |
| 5314 | 5314 | ||
| 5315 | /* | 5315 | /* |
| @@ -5368,11 +5368,11 @@ prolog_atom (char *s, size_t pos) | |||
| 5368 | 5368 | ||
| 5369 | origpos = pos; | 5369 | origpos = pos; |
| 5370 | 5370 | ||
| 5371 | if (ISLOWER(s[pos]) || (s[pos] == '_')) | 5371 | if (ISLOWER (s[pos]) || (s[pos] == '_')) |
| 5372 | { | 5372 | { |
| 5373 | /* The atom is unquoted. */ | 5373 | /* The atom is unquoted. */ |
| 5374 | pos++; | 5374 | pos++; |
| 5375 | while (ISALNUM(s[pos]) || (s[pos] == '_')) | 5375 | while (ISALNUM (s[pos]) || (s[pos] == '_')) |
| 5376 | { | 5376 | { |
| 5377 | pos++; | 5377 | pos++; |
| 5378 | } | 5378 | } |
| @@ -5715,7 +5715,7 @@ add_regex (char *regexp_pattern, language *lang) | |||
| 5715 | single_line = FALSE; /* dot does not match newline */ | 5715 | single_line = FALSE; /* dot does not match newline */ |
| 5716 | 5716 | ||
| 5717 | 5717 | ||
| 5718 | if (strlen(regexp_pattern) < 3) | 5718 | if (strlen (regexp_pattern) < 3) |
| 5719 | { | 5719 | { |
| 5720 | error ("null regexp", (char *)NULL); | 5720 | error ("null regexp", (char *)NULL); |
| 5721 | return; | 5721 | return; |
| @@ -6626,7 +6626,7 @@ filename_is_absolute (char *fn) | |||
| 6626 | { | 6626 | { |
| 6627 | return (fn[0] == '/' | 6627 | return (fn[0] == '/' |
| 6628 | #ifdef DOS_NT | 6628 | #ifdef DOS_NT |
| 6629 | || (ISALPHA(fn[0]) && fn[1] == ':' && fn[2] == '/') | 6629 | || (ISALPHA (fn[0]) && fn[1] == ':' && fn[2] == '/') |
| 6630 | #endif | 6630 | #endif |
| 6631 | ); | 6631 | ); |
| 6632 | } | 6632 | } |
| @@ -6641,7 +6641,7 @@ canonicalize_filename (register char *fn) | |||
| 6641 | 6641 | ||
| 6642 | #ifdef DOS_NT | 6642 | #ifdef DOS_NT |
| 6643 | /* Canonicalize drive letter case. */ | 6643 | /* Canonicalize drive letter case. */ |
| 6644 | # define ISUPPER(c) isupper (CHAR(c)) | 6644 | # define ISUPPER(c) isupper (CHAR (c)) |
| 6645 | if (fn[0] != '\0' && fn[1] == ':' && ISUPPER (fn[0])) | 6645 | if (fn[0] != '\0' && fn[1] == ':' && ISUPPER (fn[0])) |
| 6646 | fn[0] = lowcase (fn[0]); | 6646 | fn[0] = lowcase (fn[0]); |
| 6647 | 6647 | ||
diff --git a/lib-src/hexl.c b/lib-src/hexl.c index 89ea7d9f60c..f03663ef5be 100644 --- a/lib-src/hexl.c +++ b/lib-src/hexl.c | |||
| @@ -48,7 +48,7 @@ int base = DEFAULT_BASE, un_flag = FALSE, iso_flag = FALSE, endian = 1; | |||
| 48 | int group_by = DEFAULT_GROUPING; | 48 | int group_by = DEFAULT_GROUPING; |
| 49 | char *progname; | 49 | char *progname; |
| 50 | 50 | ||
| 51 | void usage(void) NO_RETURN; | 51 | void usage (void) NO_RETURN; |
| 52 | 52 | ||
| 53 | int | 53 | int |
| 54 | main (int argc, char **argv) | 54 | main (int argc, char **argv) |
diff --git a/lib-src/movemail.c b/lib-src/movemail.c index 097bf23c202..b6ea51f6341 100644 --- a/lib-src/movemail.c +++ b/lib-src/movemail.c | |||
| @@ -183,8 +183,8 @@ main (int argc, char **argv) | |||
| 183 | # define ARGSTR "p" | 183 | # define ARGSTR "p" |
| 184 | #endif /* MAIL_USE_POP */ | 184 | #endif /* MAIL_USE_POP */ |
| 185 | 185 | ||
| 186 | uid_t real_gid = getgid(); | 186 | uid_t real_gid = getgid (); |
| 187 | uid_t priv_gid = getegid(); | 187 | uid_t priv_gid = getegid (); |
| 188 | 188 | ||
| 189 | #ifdef WINDOWSNT | 189 | #ifdef WINDOWSNT |
| 190 | /* Ensure all file i/o is in binary mode. */ | 190 | /* Ensure all file i/o is in binary mode. */ |
diff --git a/lib-src/pop.c b/lib-src/pop.c index a94e06fbd87..ae1000742cc 100644 --- a/lib-src/pop.c +++ b/lib-src/pop.c | |||
| @@ -34,15 +34,15 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 34 | #include "ntlib.h" | 34 | #include "ntlib.h" |
| 35 | #include <winsock.h> | 35 | #include <winsock.h> |
| 36 | #undef SOCKET_ERROR | 36 | #undef SOCKET_ERROR |
| 37 | #define RECV(s,buf,len,flags) recv(s,buf,len,flags) | 37 | #define RECV(s,buf,len,flags) recv (s,buf,len,flags) |
| 38 | #define SEND(s,buf,len,flags) send(s,buf,len,flags) | 38 | #define SEND(s,buf,len,flags) send (s,buf,len,flags) |
| 39 | #define CLOSESOCKET(s) closesocket(s) | 39 | #define CLOSESOCKET(s) closesocket (s) |
| 40 | #else | 40 | #else |
| 41 | #include <netinet/in.h> | 41 | #include <netinet/in.h> |
| 42 | #include <sys/socket.h> | 42 | #include <sys/socket.h> |
| 43 | #define RECV(s,buf,len,flags) read(s,buf,len) | 43 | #define RECV(s,buf,len,flags) read (s,buf,len) |
| 44 | #define SEND(s,buf,len,flags) write(s,buf,len) | 44 | #define SEND(s,buf,len,flags) write (s,buf,len) |
| 45 | #define CLOSESOCKET(s) close(s) | 45 | #define CLOSESOCKET(s) close (s) |
| 46 | #endif | 46 | #endif |
| 47 | #include <pop.h> | 47 | #include <pop.h> |
| 48 | 48 | ||
| @@ -101,7 +101,7 @@ extern char *krb_realmofhost (/* char * */); | |||
| 101 | #endif /* KERBEROS */ | 101 | #endif /* KERBEROS */ |
| 102 | 102 | ||
| 103 | #ifndef WINDOWSNT | 103 | #ifndef WINDOWSNT |
| 104 | #if !defined(HAVE_H_ERRNO) || !defined(HAVE_CONFIG_H) | 104 | #if !defined (HAVE_H_ERRNO) || !defined (HAVE_CONFIG_H) |
| 105 | extern int h_errno; | 105 | extern int h_errno; |
| 106 | #endif | 106 | #endif |
| 107 | #endif | 107 | #endif |
| @@ -1067,7 +1067,7 @@ socket_connection (char *host, int flags) | |||
| 1067 | } | 1067 | } |
| 1068 | 1068 | ||
| 1069 | #ifdef HAVE_GETADDRINFO | 1069 | #ifdef HAVE_GETADDRINFO |
| 1070 | memset (&hints, 0, sizeof(hints)); | 1070 | memset (&hints, 0, sizeof (hints)); |
| 1071 | hints.ai_socktype = SOCK_STREAM; | 1071 | hints.ai_socktype = SOCK_STREAM; |
| 1072 | hints.ai_flags = AI_CANONNAME; | 1072 | hints.ai_flags = AI_CANONNAME; |
| 1073 | hints.ai_family = AF_INET; | 1073 | hints.ai_family = AF_INET; |
| @@ -1159,7 +1159,7 @@ socket_connection (char *host, int flags) | |||
| 1159 | krb5_free_context (kcontext); | 1159 | krb5_free_context (kcontext); |
| 1160 | strcpy (pop_error, KRB_ERROR); | 1160 | strcpy (pop_error, KRB_ERROR); |
| 1161 | strncat (pop_error, error_message (rem), | 1161 | strncat (pop_error, error_message (rem), |
| 1162 | ERROR_MAX - sizeof(KRB_ERROR)); | 1162 | ERROR_MAX - sizeof (KRB_ERROR)); |
| 1163 | CLOSESOCKET (sock); | 1163 | CLOSESOCKET (sock); |
| 1164 | return (-1); | 1164 | return (-1); |
| 1165 | } | 1165 | } |
| @@ -1212,7 +1212,7 @@ socket_connection (char *host, int flags) | |||
| 1212 | ERROR_MAX - strlen (pop_error) - 1); | 1212 | ERROR_MAX - strlen (pop_error) - 1); |
| 1213 | } | 1213 | } |
| 1214 | #elif defined HAVE_KRB5_ERROR_E_TEXT | 1214 | #elif defined HAVE_KRB5_ERROR_E_TEXT |
| 1215 | if (err_ret && err_ret->e_text && strlen(*err_ret->e_text)) | 1215 | if (err_ret && err_ret->e_text && strlen (*err_ret->e_text)) |
| 1216 | { | 1216 | { |
| 1217 | strncat (pop_error, " [server says '", | 1217 | strncat (pop_error, " [server says '", |
| 1218 | ERROR_MAX - strlen (pop_error) - 1); | 1218 | ERROR_MAX - strlen (pop_error) - 1); |